Release 1.1.0

Icon-friendly edit UI

.tx/config

@@ -1,10 +0,0 @@
-[main]
-host = https://www.transifex.com
-
-[loyalty-card-locker.stringsxml]
-file_filter = app/src/main/res/values-<lang>/strings.xml
-minimum_perc = 0
-source_file = app/src/main/res/values/strings.xml
-source_lang = en
-type = ANDROID
-

CHANGELOG.md

@@ -1,3 +1,21 @@
+## v1.1.0 (2020-11-11)
+
+Changes:
+- Improved edit UI
+- Removed header text colour option (now automatically generated based on brightness)
+- Updated translations
+
+## v1.0.1 (2020-11-07)
+
+Changes:
+- Fix crash in search with no groups
+
+## v1.0 (2020-11-06)
+
+Changes:
+- Added rounded edges to card icons on main overview
+- Added support for grouping entries
+
 ## v0.29 (2020-10-29)
 
 Changes:

Gemfile

@@ -0,0 +1,3 @@
+source "https://rubygems.org"
+
+gem "fastlane"

Gemfile.lock

@@ -0,0 +1,180 @@
+GEM
+  remote: https://rubygems.org/
+  specs:
+    CFPropertyList (3.0.2)
+    addressable (2.7.0)
+      public_suffix (>= 2.0.2, < 5.0)
+    atomos (0.1.3)
+    aws-eventstream (1.1.0)
+    aws-partitions (1.388.0)
+    aws-sdk-core (3.109.1)
+      aws-eventstream (~> 1, >= 1.0.2)
+      aws-partitions (~> 1, >= 1.239.0)
+      aws-sigv4 (~> 1.1)
+      jmespath (~> 1.0)
+    aws-sdk-kms (1.39.0)
+      aws-sdk-core (~> 3, >= 3.109.0)
+      aws-sigv4 (~> 1.1)
+    aws-sdk-s3 (1.83.1)
+      aws-sdk-core (~> 3, >= 3.109.0)
+      aws-sdk-kms (~> 1)
+      aws-sigv4 (~> 1.1)
+    aws-sigv4 (1.2.2)
+      aws-eventstream (~> 1, >= 1.0.2)
+    babosa (1.0.4)
+    claide (1.0.3)
+    colored (1.2)
+    colored2 (3.1.2)
+    commander-fastlane (4.4.6)
+      highline (~> 1.7.2)
+    declarative (0.0.20)
+    declarative-option (0.1.0)
+    digest-crc (0.6.1)
+      rake (~> 13.0)
+    domain_name (0.5.20190701)
+      unf (>= 0.0.5, < 1.0.0)
+    dotenv (2.7.6)
+    emoji_regex (3.2.0)
+    excon (0.78.0)
+    faraday (1.1.0)
+      multipart-post (>= 1.2, < 3)
+      ruby2_keywords
+    faraday-cookie_jar (0.0.7)
+      faraday (>= 0.8.0)
+      http-cookie (~> 1.0.0)
+    faraday_middleware (1.0.0)
+      faraday (~> 1.0)
+    fastimage (2.2.0)
+    fastlane (2.165.0)
+      CFPropertyList (>= 2.3, < 4.0.0)
+      addressable (>= 2.3, < 3.0.0)
+      aws-sdk-s3 (~> 1.0)
+      babosa (>= 1.0.3, < 2.0.0)
+      bundler (>= 1.12.0, < 3.0.0)
+      colored
+      commander-fastlane (>= 4.4.6, < 5.0.0)
+      dotenv (>= 2.1.1, < 3.0.0)
+      emoji_regex (>= 0.1, < 4.0)
+      excon (>= 0.71.0, < 1.0.0)
+      faraday (~> 1.0)
+      faraday-cookie_jar (~> 0.0.6)
+      faraday_middleware (~> 1.0)
+      fastimage (>= 2.1.0, < 3.0.0)
+      gh_inspector (>= 1.1.2, < 2.0.0)
+      google-api-client (>= 0.37.0, < 0.39.0)
+      google-cloud-storage (>= 1.15.0, < 2.0.0)
+      highline (>= 1.7.2, < 2.0.0)
+      json (< 3.0.0)
+      jwt (>= 2.1.0, < 3)
+      mini_magick (>= 4.9.4, < 5.0.0)
+      multipart-post (~> 2.0.0)
+      plist (>= 3.1.0, < 4.0.0)
+      rubyzip (>= 2.0.0, < 3.0.0)
+      security (= 0.1.3)
+      simctl (~> 1.6.3)
+      slack-notifier (>= 2.0.0, < 3.0.0)
+      terminal-notifier (>= 2.0.0, < 3.0.0)
+      terminal-table (>= 1.4.5, < 2.0.0)
+      tty-screen (>= 0.6.3, < 1.0.0)
+      tty-spinner (>= 0.8.0, < 1.0.0)
+      word_wrap (~> 1.0.0)
+      xcodeproj (>= 1.13.0, < 2.0.0)
+      xcpretty (~> 0.3.0)
+      xcpretty-travis-formatter (>= 0.0.3)
+    gh_inspector (1.1.3)
+    google-api-client (0.38.0)
+      addressable (~> 2.5, >= 2.5.1)
+      googleauth (~> 0.9)
+      httpclient (>= 2.8.1, < 3.0)
+      mini_mime (~> 1.0)
+      representable (~> 3.0)
+      retriable (>= 2.0, < 4.0)
+      signet (~> 0.12)
+    google-cloud-core (1.5.0)
+      google-cloud-env (~> 1.0)
+      google-cloud-errors (~> 1.0)
+    google-cloud-env (1.4.0)
+      faraday (>= 0.17.3, < 2.0)
+    google-cloud-errors (1.0.1)
+    google-cloud-storage (1.29.1)
+      addressable (~> 2.5)
+      digest-crc (~> 0.4)
+      google-api-client (~> 0.33)
+      google-cloud-core (~> 1.2)
+      googleauth (~> 0.9)
+      mini_mime (~> 1.0)
+    googleauth (0.14.0)
+      faraday (>= 0.17.3, < 2.0)
+      jwt (>= 1.4, < 3.0)
+      memoist (~> 0.16)
+      multi_json (~> 1.11)
+      os (>= 0.9, < 2.0)
+      signet (~> 0.14)
+    highline (1.7.10)
+    http-cookie (1.0.3)
+      domain_name (~> 0.5)
+    httpclient (2.8.3)
+    jmespath (1.4.0)
+    json (2.3.1)
+    jwt (2.2.2)
+    memoist (0.16.2)
+    mini_magick (4.10.1)
+    mini_mime (1.0.2)
+    multi_json (1.15.0)
+    multipart-post (2.0.0)
+    nanaimo (0.3.0)
+    naturally (2.2.0)
+    os (1.1.1)
+    plist (3.5.0)
+    public_suffix (4.0.6)
+    rake (13.0.1)
+    representable (3.0.4)
+      declarative (< 0.1.0)
+      declarative-option (< 0.2.0)
+      uber (< 0.2.0)
+    retriable (3.1.2)
+    rouge (2.0.7)
+    ruby2_keywords (0.0.2)
+    rubyzip (2.3.0)
+    security (0.1.3)
+    signet (0.14.0)
+      addressable (~> 2.3)
+      faraday (>= 0.17.3, < 2.0)
+      jwt (>= 1.5, < 3.0)
+      multi_json (~> 1.10)
+    simctl (1.6.8)
+      CFPropertyList
+      naturally
+    slack-notifier (2.3.2)
+    terminal-notifier (2.0.0)
+    terminal-table (1.8.0)
+      unicode-display_width (~> 1.1, >= 1.1.1)
+    tty-cursor (0.7.1)
+    tty-screen (0.8.1)
+    tty-spinner (0.9.3)
+      tty-cursor (~> 0.7)
+    uber (0.1.0)
+    unf (0.1.4)
+      unf_ext
+    unf_ext (0.0.7.7)
+    unicode-display_width (1.7.0)
+    word_wrap (1.0.0)
+    xcodeproj (1.19.0)
+      CFPropertyList (>= 2.3.3, < 4.0)
+      atomos (~> 0.1.3)
+      claide (>= 1.0.2, < 2.0)
+      colored2 (~> 3.1)
+      nanaimo (~> 0.3.0)
+    xcpretty (0.3.0)
+      rouge (~> 2.0.7)
+    xcpretty-travis-formatter (1.0.0)
+      xcpretty (~> 0.2, >= 0.0.7)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  fastlane
+
+BUNDLED WITH
+   2.1.4

app/build.gradle

@@ -13,8 +13,8 @@ android {
         applicationId "me.hackerchick.catima"
         minSdkVersion 16
         targetSdkVersion 29
-        versionCode 40
-        versionName "0.29"
+        versionCode 43
+        versionName "1.1.0"
     }
     buildTypes {
         release {
@@ -45,7 +45,7 @@ android {
 dependencies {
     compile fileTree(dir: 'libs', include: ['*.jar'])
     compile 'androidx.appcompat:appcompat:1.2.0'
-    compile 'com.google.android.material:material:1.2.0-alpha03'
+    compile 'com.google.android.material:material:1.2.1'
     compile 'androidx.legacy:legacy-support-v4:1.0.0'
     compile 'com.journeyapps:zxing-android-embedded:3.5.0@aar'
     compile 'com.google.zxing:core:3.3.0'
@@ -55,11 +55,9 @@ dependencies {
     compile group: 'com.google.guava', name: 'guava', version: '20.0'
     compile 'com.github.apl-devs:appintro:v4.2.0'
     compile "com.vanniktech:vntnumberpickerpreference:1.0.0"
+    implementation 'androidx.cardview:cardview:1.0.0'
     testCompile 'junit:junit:4.12'
     testCompile "org.robolectric:robolectric:4.0.2"
-
-
-
 }
 
 task findbugs(type: FindBugs, dependsOn: 'assembleDebug') {

app/release/output.json

@@ -0,0 +1 @@
+[{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":41,"versionName":"1.0","enabled":true,"outputFile":"app-release.apk","fullName":"release","baseName":"release"},"path":"app-release.apk","properties":{}}]

app/src/main/AndroidManifest.xml

@@ -33,6 +33,11 @@
                 <category android:name="android.intent.category.LAUNCHER"/>
             </intent-filter>
         </activity>
+        <activity
+            android:name=".ManageGroupsActivity"
+            android:label="@string/groups"
+            android:theme="@style/AppTheme.NoActionBar">
+        </activity>
         <activity
             android:name=".LoyaltyCardViewActivity"
             android:theme="@style/AppTheme.NoActionBar"

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

@@ -18,28 +18,53 @@ public class CsvDatabaseExporter implements DatabaseExporter
     {
         CSVPrinter printer = new CSVPrinter(output, CSVFormat.RFC4180);
 
-        // Print the header
+        // Print the version
+        printer.printRecord("2");
+
+        printer.println();
+
+        // Print the header for groups
+        printer.printRecord(DBHelper.LoyaltyCardDbGroups.ID);
+
+        Cursor groupCursor = db.getGroupCursor();
+
+        while(groupCursor.moveToNext())
+        {
+            Group group = Group.toGroup(groupCursor);
+
+            printer.printRecord(group._id);
+
+            if(Thread.currentThread().isInterrupted())
+            {
+                throw new InterruptedException();
+            }
+        }
+
+        groupCursor.close();
+
+        // Print an empty line
+        printer.println();
+
+        // Print the header for cards
         printer.printRecord(DBHelper.LoyaltyCardDbIds.ID,
                 DBHelper.LoyaltyCardDbIds.STORE,
                 DBHelper.LoyaltyCardDbIds.NOTE,
                 DBHelper.LoyaltyCardDbIds.CARD_ID,
                 DBHelper.LoyaltyCardDbIds.HEADER_COLOR,
-                DBHelper.LoyaltyCardDbIds.HEADER_TEXT_COLOR,
                 DBHelper.LoyaltyCardDbIds.BARCODE_TYPE,
                 DBHelper.LoyaltyCardDbIds.STAR_STATUS);
 
-        Cursor cursor = db.getLoyaltyCardCursor();
+        Cursor cardCursor = db.getLoyaltyCardCursor();
 
-        while(cursor.moveToNext())
+        while(cardCursor.moveToNext())
         {
-            LoyaltyCard card = LoyaltyCard.toLoyaltyCard(cursor);
+            LoyaltyCard card = LoyaltyCard.toLoyaltyCard(cardCursor);
 
             printer.printRecord(card.id,
                     card.store,
                     card.note,
                     card.cardId,
                     card.headerColor,
-                    card.headerTextColor,
                     card.barcodeType,
                     card.starStatus);
 
@@ -49,7 +74,32 @@ public class CsvDatabaseExporter implements DatabaseExporter
             }
         }
 
-        cursor.close();
+        cardCursor.close();
+
+        // Print an empty line
+        printer.println();
+
+        // Print the header for card group mappings
+        printer.printRecord(DBHelper.LoyaltyCardDbIdsGroups.cardID,
+                DBHelper.LoyaltyCardDbIdsGroups.groupID);
+
+        Cursor cardCursor2 = db.getLoyaltyCardCursor();
+
+        while(cardCursor2.moveToNext())
+        {
+            LoyaltyCard card = LoyaltyCard.toLoyaltyCard(cardCursor2);
+
+            for (Group group : db.getLoyaltyCardGroups(card.id)) {
+                printer.printRecord(card.id, group._id);
+            }
+
+            if(Thread.currentThread().isInterrupted())
+            {
+                throw new InterruptedException();
+            }
+        }
+
+        cardCursor2.close();
 
         printer.close();
     }

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

@@ -6,8 +6,11 @@ import org.apache.commons.csv.CSVFormat;
 import org.apache.commons.csv.CSVParser;
 import org.apache.commons.csv.CSVRecord;
 
+import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.InputStreamReader;
+import java.io.StringReader;
+import java.util.List;
 
 /**
  * Class for importing a database from CSV (Comma Separate Values)
@@ -19,6 +22,34 @@ import java.io.InputStreamReader;
 public class CsvDatabaseImporter implements DatabaseImporter
 {
     public void importData(DBHelper db, InputStreamReader input) throws IOException, FormatException, InterruptedException
+    {
+        BufferedReader bufferedReader = new BufferedReader(input);
+
+        bufferedReader.mark(100);
+
+        Integer version = 1;
+
+        try {
+            version = Integer.parseInt(bufferedReader.readLine());
+        } catch (NumberFormatException _e) {
+            // Assume version 1
+        }
+
+        bufferedReader.reset();
+
+        switch (version) {
+            case 1:
+                parseV1(db, bufferedReader);
+                break;
+            case 2:
+                parseV2(db, bufferedReader);
+                break;
+            default:
+                throw new FormatException(String.format("No code to parse version %s", version));
+        }
+    }
+
+    public void parseV1(DBHelper db, BufferedReader input) throws IOException, FormatException, InterruptedException
     {
         final CSVParser parser = new CSVParser(input, CSVFormat.RFC4180.withHeader());
 
@@ -51,6 +82,116 @@ public class CsvDatabaseImporter implements DatabaseImporter
         }
     }
 
+    public void parseV2(DBHelper db, BufferedReader input) throws IOException, FormatException, InterruptedException
+    {
+        SQLiteDatabase database = db.getWritableDatabase();
+        database.beginTransaction();
+
+        Integer part = 0;
+        String stringPart = "";
+
+        try {
+            while (true) {
+                String tmp = input.readLine();
+
+                if (tmp == null || tmp.isEmpty()) {
+                    switch (part) {
+                        case 0:
+                            // This is the version info, ignore
+                            break;
+                        case 1:
+                            parseV2Groups(db, database, stringPart);
+                            break;
+                        case 2:
+                            parseV2Cards(db, database, stringPart);
+                            break;
+                        case 3:
+                            parseV2CardGroups(db, database, stringPart);
+                            break;
+                        default:
+                            throw new FormatException("Issue parsing CSV data, too many parts for v2 parsing");
+                    }
+
+                    if (tmp == null) {
+                        break;
+                    }
+
+                    part += 1;
+                    stringPart = "";
+                } else {
+                    stringPart += tmp + "\n";
+                }
+            }
+            database.setTransactionSuccessful();
+        } catch (FormatException e) {
+            throw new FormatException("Issue parsing CSV data", e);
+        } finally {
+            database.endTransaction();
+            database.close();
+        }
+    }
+
+
+    public void parseV2Groups(DBHelper db, SQLiteDatabase database, String data) throws IOException, FormatException, InterruptedException
+    {
+        // Parse groups
+        final CSVParser groupParser = new CSVParser(new StringReader(data), CSVFormat.RFC4180.withHeader());
+
+        try {
+            for (CSVRecord record : groupParser) {
+                importGroup(database, db, record);
+
+                if (Thread.currentThread().isInterrupted()) {
+                    throw new InterruptedException();
+                }
+            }
+
+            groupParser.close();
+        } catch (IllegalArgumentException | IllegalStateException e) {
+            throw new FormatException("Issue parsing CSV data", e);
+        }
+    }
+
+    public void parseV2Cards(DBHelper db, SQLiteDatabase database, String data) throws IOException, FormatException, InterruptedException
+    {
+        // Parse cards
+        final CSVParser cardParser = new CSVParser(new StringReader(data), CSVFormat.RFC4180.withHeader());
+
+        try {
+            for (CSVRecord record : cardParser) {
+                importLoyaltyCard(database, db, record);
+
+                if (Thread.currentThread().isInterrupted()) {
+                    throw new InterruptedException();
+                }
+            }
+
+            cardParser.close();
+        } catch (IllegalArgumentException | IllegalStateException e) {
+            throw new FormatException("Issue parsing CSV data", e);
+        }
+    }
+
+    public void parseV2CardGroups(DBHelper db, SQLiteDatabase database, String data) throws IOException, FormatException, InterruptedException
+    {
+        // Parse card group mappings
+        final CSVParser cardGroupParser = new CSVParser(new StringReader(data), CSVFormat.RFC4180.withHeader());
+
+        try {
+            for (CSVRecord record : cardGroupParser) {
+                importCardGroupMapping(database, db, record);
+
+                if (Thread.currentThread().isInterrupted()) {
+                    throw new InterruptedException();
+                }
+            }
+
+            cardGroupParser.close();
+        } catch (IllegalArgumentException | IllegalStateException e) {
+            throw new FormatException("Issue parsing CSV data", e);
+        }
+    }
+
     /**
      * Extract a string from the items array. The index into the array
      * is determined by looking up the index in the fields map using the
@@ -133,23 +274,47 @@ public class CsvDatabaseImporter implements DatabaseImporter
         String barcodeType = extractString(DBHelper.LoyaltyCardDbIds.BARCODE_TYPE, record, "");
 
         Integer headerColor = null;
-        Integer headerTextColor = null;
 
-        if(record.isMapped(DBHelper.LoyaltyCardDbIds.HEADER_COLOR) &&
-           record.isMapped(DBHelper.LoyaltyCardDbIds.HEADER_TEXT_COLOR))
+        if(record.isMapped(DBHelper.LoyaltyCardDbIds.HEADER_COLOR))
         {
             headerColor = extractInt(DBHelper.LoyaltyCardDbIds.HEADER_COLOR, record, true);
-            headerTextColor = extractInt(DBHelper.LoyaltyCardDbIds.HEADER_TEXT_COLOR, record, true);
         }
 
         int starStatus = 0;
         try {
             starStatus = extractInt(DBHelper.LoyaltyCardDbIds.STAR_STATUS, record, false);
-        } catch (FormatException _ ) {
+        } catch (FormatException _e ) {
             // This field did not exist in versions 0.28 and before
             // We catch this exception so we can still import old backups
         }
         if (starStatus != 1) starStatus = 0;
-        helper.insertLoyaltyCard(database, id, store, note, cardId, barcodeType, headerColor, headerTextColor, starStatus);
+        helper.insertLoyaltyCard(database, id, store, note, cardId, barcodeType, headerColor, starStatus);
     }
-}
+
+    /**
+     * Import a single group into the database using the given
+     * session.
+     */
+    private void importGroup(SQLiteDatabase database, DBHelper helper, CSVRecord record)
+            throws IOException, FormatException
+    {
+        String id = extractString(DBHelper.LoyaltyCardDbGroups.ID, record, null);
+
+        helper.insertGroup(database, id);
+    }
+
+    /**
+     * Import a single card to group mapping into the database using the given
+     * session.
+     */
+    private void importCardGroupMapping(SQLiteDatabase database, DBHelper helper, CSVRecord record)
+            throws IOException, FormatException
+    {
+        Integer cardId = extractInt(DBHelper.LoyaltyCardDbIdsGroups.cardID, record, false);
+        String groupId = extractString(DBHelper.LoyaltyCardDbIdsGroups.groupID, record, null);
+
+        List<Group> cardGroups = helper.getLoyaltyCardGroups(cardId);
+        cardGroups.add(helper.getGroup(groupId));
+        helper.setLoyaltyCardGroups(database, cardId, cardGroups);
+    }
+}

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

@@ -1,17 +1,26 @@
 package protect.card_locker;
 
-
 import android.content.ContentValues;
 import android.content.Context;
 import android.database.Cursor;
 import android.database.sqlite.SQLiteDatabase;
 import android.database.sqlite.SQLiteOpenHelper;
+import android.graphics.Color;
+
+import java.util.ArrayList;
+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 = 4;
+    public static final int DATABASE_VERSION = 5;
+
+    static class LoyaltyCardDbGroups
+    {
+        public static final String TABLE = "groups";
+        public static final String ID = "_id";
+    }
 
     static class LoyaltyCardDbIds
     {
@@ -26,6 +35,13 @@ public class DBHelper extends SQLiteOpenHelper
         public static final String STAR_STATUS = "starstatus";
     }
 
+    static class LoyaltyCardDbIdsGroups
+    {
+        public static final String TABLE = "cardsGroups";
+        public static final String cardID = "cardId";
+        public static final String groupID = "groupId";
+    }
+
     public DBHelper(Context context)
     {
         super(context, DATABASE_NAME, null, DATABASE_VERSION);
@@ -34,7 +50,11 @@ public class DBHelper extends SQLiteOpenHelper
     @Override
     public void onCreate(SQLiteDatabase db)
     {
-        // create table for gift cards
+        // create table for card groups
+        db.execSQL("create table " + LoyaltyCardDbGroups.TABLE + "(" +
+                LoyaltyCardDbGroups.ID + " TEXT primary key not null)");
+
+        // create table for cards
         db.execSQL("create table " + LoyaltyCardDbIds.TABLE + "(" +
                 LoyaltyCardDbIds.ID + " INTEGER primary key autoincrement," +
                 LoyaltyCardDbIds.STORE + " TEXT not null," +
@@ -44,6 +64,12 @@ public class DBHelper extends SQLiteOpenHelper
                 LoyaltyCardDbIds.CARD_ID + " TEXT not null," +
                 LoyaltyCardDbIds.BARCODE_TYPE + " TEXT not null," +
                 LoyaltyCardDbIds.STAR_STATUS + " INTEGER DEFAULT '0' )");
+
+        // create associative table for cards in groups
+        db.execSQL("create table " + LoyaltyCardDbIdsGroups.TABLE + "(" +
+                LoyaltyCardDbIdsGroups.cardID + " INTEGER," +
+                LoyaltyCardDbIdsGroups.groupID + " TEXT," +
+                "primary key (" + LoyaltyCardDbIdsGroups.cardID + "," + LoyaltyCardDbIdsGroups.groupID +"))");
     }
 
     @Override
@@ -64,18 +90,30 @@ public class DBHelper extends SQLiteOpenHelper
             db.execSQL("ALTER TABLE " + LoyaltyCardDbIds.TABLE
                     + " ADD COLUMN " + LoyaltyCardDbIds.HEADER_TEXT_COLOR + " INTEGER");
         }
+
         // Upgrade from version 3 to version 4
         if(oldVersion < 4 && newVersion >= 4)
         {
             db.execSQL("ALTER TABLE " + LoyaltyCardDbIds.TABLE
                     + " ADD COLUMN " + LoyaltyCardDbIds.STAR_STATUS + " INTEGER DEFAULT '0'");
+        }
 
+        // Upgrade from version 4 to version 5
+        if(oldVersion < 5 && newVersion >= 5)
+        {
+            db.execSQL("create table " + LoyaltyCardDbGroups.TABLE + "(" +
+                    LoyaltyCardDbGroups.ID + " TEXT primary key not null)");
+
+            db.execSQL("create table " + LoyaltyCardDbIdsGroups.TABLE + "(" +
+                    LoyaltyCardDbIdsGroups.cardID + " INTEGER," +
+                    LoyaltyCardDbIdsGroups.groupID + " TEXT," +
+                    "primary key (" + LoyaltyCardDbIdsGroups.cardID + "," + LoyaltyCardDbIdsGroups.groupID +"))");
         }
     }
 
     public long insertLoyaltyCard(final String store, final String note, final String cardId,
                                   final String barcodeType, final Integer headerColor,
-                                  final Integer headerTextColor, final int starStatus)
+                                  final int starStatus)
     {
         SQLiteDatabase db = getWritableDatabase();
         ContentValues contentValues = new ContentValues();
@@ -84,16 +122,16 @@ public class DBHelper extends SQLiteOpenHelper
         contentValues.put(LoyaltyCardDbIds.CARD_ID, cardId);
         contentValues.put(LoyaltyCardDbIds.BARCODE_TYPE, barcodeType);
         contentValues.put(LoyaltyCardDbIds.HEADER_COLOR, headerColor);
-        contentValues.put(LoyaltyCardDbIds.HEADER_TEXT_COLOR, headerTextColor);
+        contentValues.put(LoyaltyCardDbIds.HEADER_TEXT_COLOR, Color.WHITE);
         contentValues.put(LoyaltyCardDbIds.STAR_STATUS, starStatus);
         final long newId = db.insert(LoyaltyCardDbIds.TABLE, null, contentValues);
         return newId;
     }
 
-    public boolean insertLoyaltyCard(final SQLiteDatabase db, final int id,
-                                     final String store, final String note, final String cardId,
+    public boolean insertLoyaltyCard(final SQLiteDatabase db, final int id, final String store,
+                                     final String note, final String cardId,
                                      final String barcodeType, final Integer headerColor,
-                                     final Integer headerTextColor, final int starStatus)
+                                     final int starStatus)
     {
         ContentValues contentValues = new ContentValues();
         contentValues.put(LoyaltyCardDbIds.ID, id);
@@ -102,16 +140,15 @@ public class DBHelper extends SQLiteOpenHelper
         contentValues.put(LoyaltyCardDbIds.CARD_ID, cardId);
         contentValues.put(LoyaltyCardDbIds.BARCODE_TYPE, barcodeType);
         contentValues.put(LoyaltyCardDbIds.HEADER_COLOR, headerColor);
-        contentValues.put(LoyaltyCardDbIds.HEADER_TEXT_COLOR, headerTextColor);
+        contentValues.put(LoyaltyCardDbIds.HEADER_TEXT_COLOR, Color.WHITE);
         contentValues.put(LoyaltyCardDbIds.STAR_STATUS,starStatus);
         final long newId = db.insert(LoyaltyCardDbIds.TABLE, null, contentValues);
         return (newId != -1);
     }
 
-
     public boolean updateLoyaltyCard(final int id, final String store, final String note,
                                      final String cardId, final String barcodeType,
-                                     final Integer headerColor, final Integer headerTextColor)
+                                     final Integer headerColor)
     {
         SQLiteDatabase db = getWritableDatabase();
         ContentValues contentValues = new ContentValues();
@@ -120,7 +157,7 @@ public class DBHelper extends SQLiteOpenHelper
         contentValues.put(LoyaltyCardDbIds.CARD_ID, cardId);
         contentValues.put(LoyaltyCardDbIds.BARCODE_TYPE, barcodeType);
         contentValues.put(LoyaltyCardDbIds.HEADER_COLOR, headerColor);
-        contentValues.put(LoyaltyCardDbIds.HEADER_TEXT_COLOR, headerTextColor);
+        contentValues.put(LoyaltyCardDbIds.HEADER_TEXT_COLOR, Color.WHITE);
         int rowsUpdated = db.update(LoyaltyCardDbIds.TABLE, contentValues,
                 LoyaltyCardDbIds.ID + "=?",
                 new String[]{Integer.toString(id)});
@@ -149,6 +186,7 @@ public class DBHelper extends SQLiteOpenHelper
         if(data.getCount() == 1)
         {
             data.moveToFirst();
+
             card = LoyaltyCard.toLoyaltyCard(data);
         }
 
@@ -157,12 +195,76 @@ public class DBHelper extends SQLiteOpenHelper
         return card;
     }
 
+    public List<Group> getLoyaltyCardGroups(final int id)
+    {
+        SQLiteDatabase db = getReadableDatabase();
+        Cursor data = db.rawQuery("select * from " + LoyaltyCardDbGroups.TABLE + " g " +
+                " LEFT JOIN " + LoyaltyCardDbIdsGroups.TABLE + " ig ON ig." + LoyaltyCardDbIdsGroups.groupID + " = g." + LoyaltyCardDbGroups.ID +
+                " where " + LoyaltyCardDbIdsGroups.cardID + "=?" +
+                " ORDER BY " + LoyaltyCardDbIdsGroups.groupID, new String[]{String.format("%d", id)});
+
+        List<Group> groups = new ArrayList<>();
+
+        if (!data.moveToFirst()) {
+            return groups;
+        }
+
+        groups.add(Group.toGroup(data));
+
+        while (data.moveToNext()) {
+            groups.add(Group.toGroup(data));
+        }
+
+        return groups;
+    }
+
+    public void setLoyaltyCardGroups(final int id, List<Group> groups)
+    {
+        SQLiteDatabase db = getWritableDatabase();
+
+        // First delete lookup table entries associated with this card
+        db.delete(LoyaltyCardDbIdsGroups.TABLE,
+                LoyaltyCardDbIdsGroups.cardID + " = ? ",
+                new String[]{String.format("%d", id)});
+
+        // Then create entries for selected values
+        for (Group group : groups) {
+            ContentValues contentValues = new ContentValues();
+            contentValues.put(LoyaltyCardDbIdsGroups.cardID, id);
+            contentValues.put(LoyaltyCardDbIdsGroups.groupID, group._id);
+            db.insert(LoyaltyCardDbIdsGroups.TABLE, null, contentValues);
+        }
+    }
+
+    public void setLoyaltyCardGroups(final SQLiteDatabase db, final int id, List<Group> groups)
+    {
+        // First delete lookup table entries associated with this card
+        db.delete(LoyaltyCardDbIdsGroups.TABLE,
+                LoyaltyCardDbIdsGroups.cardID + " = ? ",
+                new String[]{String.format("%d", id)});
+
+        // Then create entries for selected values
+        for (Group group : groups) {
+            ContentValues contentValues = new ContentValues();
+            contentValues.put(LoyaltyCardDbIdsGroups.cardID, id);
+            contentValues.put(LoyaltyCardDbIdsGroups.groupID, group._id);
+            db.insert(LoyaltyCardDbIdsGroups.TABLE, null, contentValues);
+        }
+    }
+
     public boolean deleteLoyaltyCard (final int id)
     {
         SQLiteDatabase db = getWritableDatabase();
-        int rowsDeleted =  db.delete(LoyaltyCardDbIds.TABLE,
+        // Delete card
+        int rowsDeleted = db.delete(LoyaltyCardDbIds.TABLE,
                 LoyaltyCardDbIds.ID + " = ? ",
                 new String[]{String.format("%d", id)});
+
+        // And delete lookup table entries associated with this card
+        db.delete(LoyaltyCardDbIdsGroups.TABLE,
+                LoyaltyCardDbIdsGroups.cardID + " = ? ",
+                new String[]{String.format("%d", id)});
+
         return (rowsDeleted == 1);
     }
 
@@ -179,16 +281,52 @@ public class DBHelper extends SQLiteOpenHelper
      * @return Cursor
      */
     public Cursor getLoyaltyCardCursor(final String filter)
+    {
+        return getLoyaltyCardCursor(filter, null);
+    }
+
+    /**
+     * Returns a cursor to all loyalty cards with the filter text in either the store or note in a certain group.
+     *
+     * @param filter
+     * @param group
+     * @return Cursor
+     */
+    public Cursor getLoyaltyCardCursor(final String filter, Group group)
     {
         String actualFilter = String.format("%%%s%%", filter);
         String[] selectionArgs = { actualFilter, actualFilter };
+        StringBuilder groupFilter = new StringBuilder();
+        String limitString = "";
 
         SQLiteDatabase db = getReadableDatabase();
 
+        if (group != null) {
+            List<Integer> allowedIds = getGroupCardIds(group._id);
+
+            // Empty group
+            if (allowedIds.size() > 0) {
+                groupFilter.append("AND (");
+
+                for (int i = 0; i < allowedIds.size(); i++) {
+                    groupFilter.append(LoyaltyCardDbIds.ID + " = " + allowedIds.get(i));
+                    if (i != allowedIds.size() - 1) {
+                        groupFilter.append(" OR ");
+                    }
+                }
+                groupFilter.append(") ");
+            } else {
+                limitString = "LIMIT 0";
+            }
+        }
+
         Cursor res = db.rawQuery("select * from " + LoyaltyCardDbIds.TABLE +
-                " WHERE " + LoyaltyCardDbIds.STORE + "  LIKE ? " +
-                " OR " + LoyaltyCardDbIds.NOTE + " LIKE ? " +
-                " ORDER BY " + LoyaltyCardDbIds.STAR_STATUS + " DESC," + LoyaltyCardDbIds.STORE + " COLLATE NOCASE ASC", selectionArgs, null);
+                " WHERE (" + LoyaltyCardDbIds.STORE + "  LIKE ? " +
+                " OR " + LoyaltyCardDbIds.NOTE + " LIKE ? )" +
+                groupFilter.toString() +
+                " ORDER BY " + LoyaltyCardDbIds.STAR_STATUS + " DESC," + LoyaltyCardDbIds.STORE + " COLLATE NOCASE ASC " +
+                limitString, selectionArgs, null);
+
         return res;
     }
 
@@ -227,5 +365,172 @@ public class DBHelper extends SQLiteOpenHelper
 
         return numItems;
     }
+
+    /**
+     * Returns a cursor to all groups.
+     *
+     * @return Cursor
+     */
+    public Cursor getGroupCursor()
+    {
+        SQLiteDatabase db = getReadableDatabase();
+
+        Cursor res = db.rawQuery("select * from " + LoyaltyCardDbGroups.TABLE +
+                " ORDER BY " + LoyaltyCardDbGroups.ID + " COLLATE NOCASE ASC", null, null);
+        return res;
+    }
+
+    public List<Group> getGroups() {
+        Cursor data = getGroupCursor();
+
+        List<Group> groups = new ArrayList<>();
+
+        if (!data.moveToFirst()) {
+            return groups;
+        }
+
+        groups.add(Group.toGroup(data));
+
+        while (data.moveToNext()) {
+            groups.add(Group.toGroup(data));
+        }
+
+        return groups;
+    }
+
+    public Group getGroup(final String groupName)
+    {
+        SQLiteDatabase db = getReadableDatabase();
+        Cursor data = db.rawQuery("select * from " + LoyaltyCardDbGroups.TABLE +
+                " where " + LoyaltyCardDbGroups.ID + "=?", new String[]{groupName});
+
+        Group group = null;
+
+        if(data.getCount() == 1)
+        {
+            data.moveToFirst();
+
+            group = Group.toGroup(data);
+        }
+
+        data.close();
+
+        return group;
+    }
+
+    public int getGroupCount()
+    {
+        SQLiteDatabase db = getReadableDatabase();
+        Cursor data =  db.rawQuery("SELECT Count(*) FROM " + LoyaltyCardDbGroups.TABLE, null);
+
+        int numItems = 0;
+
+        if(data.getCount() == 1)
+        {
+            data.moveToFirst();
+            numItems = data.getInt(0);
+        }
+
+        data.close();
+
+        return numItems;
+    }
+
+    public List<Integer> getGroupCardIds(final String groupName)
+    {
+        SQLiteDatabase db = getReadableDatabase();
+        Cursor data =  db.rawQuery("SELECT " + LoyaltyCardDbIdsGroups.cardID +
+                " FROM " + LoyaltyCardDbIdsGroups.TABLE +
+                " WHERE " + LoyaltyCardDbIdsGroups.groupID + " =? ", new String[]{groupName});
+
+        List<Integer> cardIds = new ArrayList<>();
+
+        if (!data.moveToFirst()) {
+            return cardIds;
+        }
+
+        cardIds.add(data.getInt(0));
+
+        while (data.moveToNext()) {
+            cardIds.add(data.getInt(0));
+        }
+
+        data.close();
+
+        return cardIds;
+    }
+
+    public long insertGroup(final String name)
+    {
+        if (name.isEmpty()) return -1;
+
+        SQLiteDatabase db = getWritableDatabase();
+        ContentValues contentValues = new ContentValues();
+        contentValues.put(LoyaltyCardDbGroups.ID, name);
+        final long newId = db.insert(LoyaltyCardDbGroups.TABLE, null, contentValues);
+        return newId;
+    }
+
+    public boolean insertGroup(final SQLiteDatabase db, final String name)
+    {
+        ContentValues contentValues = new ContentValues();
+        contentValues.put(LoyaltyCardDbGroups.ID, name);
+        final long newId = db.insert(LoyaltyCardDbGroups.TABLE, null, contentValues);
+        return (newId != -1);
+    }
+
+    public boolean updateGroup(final String groupName, final String newName)
+    {
+        if (newName.isEmpty()) return false;
+
+        SQLiteDatabase db = getWritableDatabase();
+        ContentValues contentValues = new ContentValues();
+        contentValues.put(LoyaltyCardDbGroups.ID, newName);
+        try {
+            int rowsUpdated = db.update(LoyaltyCardDbGroups.TABLE, contentValues,
+                    LoyaltyCardDbGroups.ID + "=?",
+                    new String[]{groupName});
+            return (rowsUpdated == 1);
+        } catch (android.database.sqlite.SQLiteConstraintException _e) {
+            return false;
+        }
+    }
+
+    public boolean deleteGroup(final String groupName)
+    {
+        SQLiteDatabase db = getWritableDatabase();
+        // Delete group
+        int rowsDeleted = db.delete(LoyaltyCardDbGroups.TABLE,
+                LoyaltyCardDbGroups.ID + " = ? ",
+                new String[]{groupName});
+
+        // And delete lookup table entries associated with this group
+        db.delete(LoyaltyCardDbIdsGroups.TABLE,
+                LoyaltyCardDbIdsGroups.groupID + " = ? ",
+                new String[]{groupName});
+
+        return (rowsDeleted == 1);
+    }
+
+    public int getGroupCardCount(final String groupName)
+    {
+        SQLiteDatabase db = getReadableDatabase();
+
+        Cursor data =  db.rawQuery("SELECT Count(*) FROM " + LoyaltyCardDbIdsGroups.TABLE +
+                " where " + LoyaltyCardDbIdsGroups.groupID + "=?",
+                new String[]{groupName});
+
+        int numItems = 0;
+
+        if(data.getCount() == 1)
+        {
+            data.moveToFirst();
+            numItems = data.getInt(0);
+        }
+
+        data.close();
+
+        return numItems;
+    }
 }
 

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

@@ -0,0 +1,20 @@
+package protect.card_locker;
+
+import android.database.Cursor;
+
+public class Group
+{
+    public final String _id;
+
+    public Group(final String _id)
+    {
+        this._id = _id;
+    }
+
+    public static Group toGroup(Cursor cursor)
+    {
+        String _id = cursor.getString(cursor.getColumnIndexOrThrow(DBHelper.LoyaltyCardDbGroups.ID));
+
+        return new Group(_id);
+    }
+}

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

@@ -0,0 +1,53 @@
+package protect.card_locker;
+
+import android.content.Context;
+import android.database.Cursor;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.CursorAdapter;
+import android.widget.TextView;
+
+import protect.card_locker.preferences.Settings;
+
+class GroupCursorAdapter extends CursorAdapter
+{
+    Settings settings;
+    DBHelper db;
+
+    public GroupCursorAdapter(Context context, Cursor cursor)
+    {
+        super(context, cursor, 0);
+        settings = new Settings(context);
+
+        db = new DBHelper(context);
+    }
+
+    // The newView method is used to inflate a new view and return it,
+    // you don't bind any data to the view at this point.
+    @Override
+    public View newView(Context context, Cursor cursor, ViewGroup parent)
+    {
+        return LayoutInflater.from(context).inflate(R.layout.group_layout, parent, false);
+    }
+
+    // The bindView method is used to bind all data to a given view
+    // such as setting the text on a TextView.
+    @Override
+    public void bindView(View view, Context context, Cursor cursor)
+    {
+        // Find fields to populate in inflated template
+        TextView nameField = (TextView) view.findViewById(R.id.name);
+        TextView countField = (TextView) view.findViewById(R.id.cardCount);
+
+        // Extract properties from cursor
+        Group group = Group.toGroup(cursor);
+
+        // Populate fields with extracted properties
+        nameField.setText(group._id);
+        countField.setText(String.format(context.getString(R.string.groupCardCount), db.getGroupCardCount(group._id)));
+
+        nameField.setTextSize(settings.getCardTitleListFontSize());
+        countField.setTextSize(settings.getCardNoteListFontSize());
+    }
+}

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

@@ -12,9 +12,6 @@ public class ImportURIHelper {
     private static final String BARCODE_TYPE = DBHelper.LoyaltyCardDbIds.BARCODE_TYPE;
 
     private static final String HEADER_COLOR = DBHelper.LoyaltyCardDbIds.HEADER_COLOR;
-    private static final String HEADER_TEXT_COLOR = DBHelper.LoyaltyCardDbIds.HEADER_TEXT_COLOR;
-
-
 
     private final Context context;
     private final String host;
@@ -57,11 +54,6 @@ public class ImportURIHelper {
             {
                 headerColor = Integer.parseInt(unparsedHeaderColor);
             }
-            String unparsedHeaderTextColor = uri.getQueryParameter(HEADER_TEXT_COLOR);
-            if(unparsedHeaderTextColor != null)
-            {
-                headerTextColor = Integer.parseInt(unparsedHeaderTextColor);
-            }
 
             return new LoyaltyCard(-1, store, note, cardId, barcodeType, headerColor, headerTextColor, 0);
         } catch (NullPointerException | NumberFormatException ex) {
@@ -83,10 +75,6 @@ public class ImportURIHelper {
         {
             uriBuilder.appendQueryParameter(HEADER_COLOR, loyaltyCard.headerColor.toString());
         }
-        if(loyaltyCard.headerTextColor != null)
-        {
-            uriBuilder.appendQueryParameter(HEADER_TEXT_COLOR, loyaltyCard.headerTextColor.toString());
-        }
         //StarStatus will not be exported
         return uriBuilder.build();
     }

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

@@ -1,6 +1,7 @@
 package protect.card_locker;
 
 import android.database.Cursor;
+
 import androidx.annotation.Nullable;
 
 public class LoyaltyCard
@@ -20,7 +21,8 @@ public class LoyaltyCard
     public final int starStatus;
 
     public LoyaltyCard(final int id, final String store, final String note, final String cardId,
-                       final String barcodeType, final Integer headerColor, final Integer headerTextColor,final int starStatus)
+                       final String barcodeType, final Integer headerColor, final Integer headerTextColor,
+                       final int starStatus)
     {
         this.id = id;
         this.store = store;

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

@@ -71,13 +71,6 @@ class LoyaltyCardCursorAdapter extends CursorAdapter
         if (loyaltyCard.starStatus!=0) star.setVisibility(View.VISIBLE);
             else star.setVisibility(View.GONE);
 
-        int tileLetterFontSize = context.getResources().getDimensionPixelSize(R.dimen.tileLetterFontSize);
-        int pixelSize = context.getResources().getDimensionPixelSize(R.dimen.cardThumbnailSize);
-
-        Integer letterBackgroundColor = loyaltyCard.headerColor;
-        Integer letterTextColor = loyaltyCard.headerTextColor;
-        LetterBitmap letterBitmap = new LetterBitmap(context, loyaltyCard.store, loyaltyCard.store,
-                tileLetterFontSize, pixelSize, pixelSize, letterBackgroundColor, letterTextColor);
-        thumbnail.setImageBitmap(letterBitmap.getLetterTile());
+        thumbnail.setImageBitmap(Utils.generateIcon(context, loyaltyCard.store, loyaltyCard.headerColor).getLetterTile());
     }
 }

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

@@ -9,17 +9,25 @@ import android.net.Uri;
 import android.os.Build;
 import android.os.Bundle;
 
+import com.google.android.material.chip.Chip;
+import com.google.android.material.chip.ChipGroup;
 import com.google.android.material.floatingactionbutton.FloatingActionButton;
 import com.google.android.material.snackbar.Snackbar;
 import androidx.appcompat.app.ActionBar;
 import androidx.appcompat.app.AlertDialog;
 import androidx.appcompat.app.AppCompatActivity;
 import androidx.appcompat.widget.Toolbar;
+
+import android.text.Editable;
+import android.text.TextWatcher;
 import android.util.Log;
+import android.view.KeyEvent;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewTreeObserver;
+import android.widget.ArrayAdapter;
+import android.widget.AutoCompleteTextView;
 import android.widget.Button;
 import android.widget.EditText;
 import android.widget.ImageView;
@@ -33,24 +41,23 @@ import com.jaredrummler.android.colorpicker.ColorPickerDialog;
 import com.jaredrummler.android.colorpicker.ColorPickerDialogListener;
 
 import java.io.InvalidObjectException;
+import java.util.ArrayList;
+import java.util.List;
 
 public class LoyaltyCardEditActivity extends AppCompatActivity
 {
     private static final String TAG = "Catima";
-    protected static final String NO_BARCODE = "_NO_BARCODE_";
 
     protected static final int SELECT_BARCODE_REQUEST = 1;
 
+    ImageView thumbnail;
     EditText storeFieldEdit;
     EditText noteFieldEdit;
-    ImageView headingColorSample;
-    Button headingColorSelectButton;
-    ImageView headingStoreTextColorSample;
-    Button headingStoreTextColorSelectButton;
+    ChipGroup groupsChips;
+    View cardAndBarcodeLayout;
     TextView cardIdFieldView;
-    View cardIdDivider;
-    View cardIdTableRow;
-    TextView barcodeTypeField;
+    View barcodeTypeView;
+    AutoCompleteTextView barcodeTypeField;
     ImageView barcodeImage;
     View barcodeImageLayout;
     View barcodeCaptureLayout;
@@ -62,7 +69,6 @@ public class LoyaltyCardEditActivity extends AppCompatActivity
     boolean updateLoyaltyCard;
     Uri importLoyaltyCardUri = null;
     Integer headingColorValue = null;
-    Integer headingStoreTextColorValue = null;
 
     DBHelper db;
     ImportURIHelper importUriHelper;
@@ -97,22 +103,73 @@ public class LoyaltyCardEditActivity extends AppCompatActivity
         db = new DBHelper(this);
         importUriHelper = new ImportURIHelper(this);
 
+        thumbnail = findViewById(R.id.thumbnail);
         storeFieldEdit = findViewById(R.id.storeNameEdit);
         noteFieldEdit = findViewById(R.id.noteEdit);
-        headingColorSample = findViewById(R.id.headingColorSample);
-        headingColorSelectButton = findViewById(R.id.headingColorSelectButton);
-        headingStoreTextColorSample = findViewById(R.id.headingStoreTextColorSample);
-        headingStoreTextColorSelectButton = findViewById(R.id.headingStoreTextColorSelectButton);
+        groupsChips = findViewById(R.id.groupChips);
+        cardAndBarcodeLayout = findViewById(R.id.cardAndBarcodeLayout);
         cardIdFieldView = findViewById(R.id.cardIdView);
-        cardIdDivider = findViewById(R.id.cardIdDivider);
-        cardIdTableRow = findViewById(R.id.cardIdTableRow);
-        barcodeTypeField = findViewById(R.id.barcodeTypeView);
+        barcodeTypeView = findViewById(R.id.barcodeTypeView);
+        barcodeTypeField = findViewById(R.id.barcodeTypeField);
         barcodeImage = findViewById(R.id.barcode);
         barcodeImageLayout = findViewById(R.id.barcodeLayout);
         barcodeCaptureLayout = findViewById(R.id.barcodeCaptureLayout);
 
         captureButton = findViewById(R.id.captureButton);
         enterButton = findViewById(R.id.enterButton);
+
+        storeFieldEdit.addTextChangedListener(new TextWatcher() {
+            @Override
+            public void beforeTextChanged(CharSequence s, int start, int count, int after) { }
+
+            @Override
+            public void onTextChanged(CharSequence s, int start, int before, int count) {
+                generateIcon(s.toString());
+            }
+
+            @Override
+            public void afterTextChanged(Editable s) { }
+        });
+
+        cardIdFieldView.addTextChangedListener(new TextWatcher() {
+            @Override
+            public void beforeTextChanged(CharSequence s, int start, int count, int after) { }
+
+            @Override
+            public void onTextChanged(CharSequence s, int start, int before, int count) {
+                String formatString = barcodeTypeField.getText().toString();
+
+                if (!formatString.isEmpty()) {
+                    if (formatString.equals(getString(R.string.noBarcode))) {
+                        hideBarcode();
+                    } else {
+                        generateBarcode(s.toString(), BarcodeFormat.valueOf(formatString));
+                    }
+                }
+            }
+
+            @Override
+            public void afterTextChanged(Editable s) { }
+        });
+
+        barcodeTypeField.addTextChangedListener(new TextWatcher() {
+            @Override
+            public void beforeTextChanged(CharSequence s, int start, int count, int after) { }
+
+            @Override
+            public void onTextChanged(CharSequence s, int start, int before, int count) {
+                if (!s.toString().isEmpty()) {
+                    if (s.toString().equals(getString(R.string.noBarcode))) {
+                        hideBarcode();
+                    } else {
+                        generateBarcode(cardIdFieldView.getText().toString(), BarcodeFormat.valueOf(s.toString()));
+                    }
+                }
+            }
+
+            @Override
+            public void afterTextChanged(Editable s) { }
+        });
     }
 
     @Override
@@ -165,7 +222,7 @@ public class LoyaltyCardEditActivity extends AppCompatActivity
 
             if(barcodeTypeField.getText().length() == 0)
             {
-                barcodeTypeField.setText(loyaltyCard.barcodeType.isEmpty() ? LoyaltyCardEditActivity.NO_BARCODE : loyaltyCard.barcodeType);
+                barcodeTypeField.setText(loyaltyCard.barcodeType.isEmpty() ? getString(R.string.noBarcode) : loyaltyCard.barcodeType);
             }
 
             if(headingColorValue == null)
@@ -177,15 +234,6 @@ public class LoyaltyCardEditActivity extends AppCompatActivity
                 }
             }
 
-            if(headingStoreTextColorValue == null)
-            {
-                headingStoreTextColorValue = loyaltyCard.headerTextColor;
-                if(headingStoreTextColorValue == null)
-                {
-                    headingStoreTextColorValue = Color.WHITE;
-                }
-            }
-
             setTitle(R.string.editCardTitle);
         }
         else if(importLoyaltyCardUri != null)
@@ -205,7 +253,6 @@ public class LoyaltyCardEditActivity extends AppCompatActivity
             cardIdFieldView.setText(importCard.cardId);
             barcodeTypeField.setText(importCard.barcodeType);
             headingColorValue = importCard.headerColor;
-            headingStoreTextColorValue = importCard.headerTextColor;
         }
         else
         {
@@ -213,6 +260,35 @@ public class LoyaltyCardEditActivity extends AppCompatActivity
             hideBarcode();
         }
 
+        if(groupsChips.getChildCount() == 0)
+        {
+            List<Group> existingGroups = db.getGroups();
+
+            List<Group> loyaltyCardGroups = db.getLoyaltyCardGroups(loyaltyCardId);
+
+            if (existingGroups.isEmpty()) {
+                groupsChips.setVisibility(View.GONE);
+            } else {
+                groupsChips.setVisibility(View.VISIBLE);
+            }
+
+            for (Group group : db.getGroups()) {
+                Chip chip = (Chip) getLayoutInflater().inflate(R.layout.layout_chip_choice, groupsChips, false);
+                chip.setText(group._id);
+                chip.setTag(group);
+
+                chip.setChecked(false);
+                for (Group loyaltyCardGroup : loyaltyCardGroups) {
+                    if (loyaltyCardGroup._id.equals(group._id)) {
+                        chip.setChecked(true);
+                        break;
+                    }
+                }
+
+                groupsChips.addView(chip);
+            }
+        }
+
         if(headingColorValue == null)
         {
             // Select a random color to start out with.
@@ -222,59 +298,22 @@ public class LoyaltyCardEditActivity extends AppCompatActivity
             colors.recycle();
         }
 
-        if(headingStoreTextColorValue == null) {
-            headingStoreTextColorValue = Color.WHITE;
-        }
-
-        headingColorSample.setBackgroundColor(headingColorValue);
-        headingStoreTextColorSample.setBackgroundColor(headingStoreTextColorValue);
-        headingColorSelectButton.setOnClickListener(new ColorSelectListener(headingColorValue, true));
-        headingStoreTextColorSelectButton.setOnClickListener(new ColorSelectListener(headingStoreTextColorValue, false));
+        thumbnail.setOnClickListener(new ColorSelectListener(headingColorValue));
 
         if(cardIdFieldView.getText().length() > 0 && barcodeTypeField.getText().length() > 0)
         {
-            if(barcodeTypeField.getText().toString().equals(NO_BARCODE))
+            String formatString = barcodeTypeField.getText().toString();
+
+            if(formatString.isEmpty() || formatString.equals(getString(R.string.noBarcode)))
             {
                 hideBarcode();
             }
             else
             {
-                String formatString = barcodeTypeField.getText().toString();
                 final BarcodeFormat format = BarcodeFormat.valueOf(formatString);
                 final String cardIdString = cardIdFieldView.getText().toString();
 
-                if(barcodeImage.getHeight() == 0)
-                {
-                    Log.d(TAG, "ImageView size is not known known at start, waiting for load");
-                    // The size of the ImageView is not yet available as it has not
-                    // yet been drawn. Wait for it to be drawn so the size is available.
-                    barcodeImage.getViewTreeObserver().addOnGlobalLayoutListener(
-                            new ViewTreeObserver.OnGlobalLayoutListener()
-                            {
-                                @Override
-                                public void onGlobalLayout()
-                                {
-                                    if (Build.VERSION.SDK_INT < 16)
-                                    {
-                                        barcodeImage.getViewTreeObserver().removeGlobalOnLayoutListener(this);
-                                    }
-                                    else
-                                    {
-                                        barcodeImage.getViewTreeObserver().removeOnGlobalLayoutListener(this);
-                                    }
-
-                                    Log.d(TAG, "ImageView size now known");
-                                    new BarcodeImageWriterTask(barcodeImage, cardIdString, format).execute();
-                                }
-                            });
-                }
-                else
-                {
-                    Log.d(TAG, "ImageView size known known, creating barcode");
-                    new BarcodeImageWriterTask(barcodeImage, cardIdString, format).execute();
-                }
-
-                showBarcode();
+                generateBarcode(cardIdString, format);
             }
         }
 
@@ -295,38 +334,25 @@ public class LoyaltyCardEditActivity extends AppCompatActivity
 
         captureButton.setOnClickListener(captureCallback);
 
-        enterButton.setOnClickListener(new View.OnClickListener()
-        {
-            @Override
-            public void onClick(View v)
-            {
-                Intent i = new Intent(getApplicationContext(), BarcodeSelectorActivity.class);
-
-                String cardId = cardIdFieldView.getText().toString();
-                if(cardId.length() > 0)
-                {
-                    final Bundle b = new Bundle();
-                    b.putString("initialCardId", cardId);
-                    i.putExtras(b);
-                }
-
-                startActivityForResult(i, SELECT_BARCODE_REQUEST);
-            }
-        });
+        enterButton.setOnClickListener(new EditCardIdAndBarcode());
+        barcodeImage.setOnClickListener(new EditCardIdAndBarcode());
 
         if(cardIdFieldView.getText().length() > 0)
         {
-            cardIdDivider.setVisibility(View.VISIBLE);
-            cardIdTableRow.setVisibility(View.VISIBLE);
+            cardAndBarcodeLayout.setVisibility(View.VISIBLE);
             enterButton.setText(R.string.editCard);
         }
         else
         {
-            cardIdDivider.setVisibility(View.GONE);
-            cardIdTableRow.setVisibility(View.GONE);
+            cardAndBarcodeLayout.setVisibility(View.GONE);
             enterButton.setText(R.string.enterCard);
         }
 
+        ArrayList<String> barcodeList = new ArrayList<>(BarcodeSelectorActivity.SUPPORTED_BARCODE_TYPES);
+        barcodeList.add(0, getString(R.string.noBarcode));
+        ArrayAdapter<String> barcodeAdapter = new ArrayAdapter<>(this, android.R.layout.select_dialog_item, barcodeList);
+        barcodeTypeField.setAdapter(barcodeAdapter);
+
         FloatingActionButton saveButton = findViewById(R.id.fabSave);
         saveButton.setOnClickListener(new View.OnClickListener() {
             @Override
@@ -334,17 +360,36 @@ public class LoyaltyCardEditActivity extends AppCompatActivity
                 doSave();
             }
         });
+
+        generateIcon(storeFieldEdit.getText().toString());
+    }
+
+    class EditCardIdAndBarcode implements View.OnClickListener
+    {
+        @Override
+        public void onClick(View v)
+        {
+            Intent i = new Intent(getApplicationContext(), BarcodeSelectorActivity.class);
+
+            String cardId = cardIdFieldView.getText().toString();
+            if(cardId.length() > 0)
+            {
+                final Bundle b = new Bundle();
+                b.putString("initialCardId", cardId);
+                i.putExtras(b);
+            }
+
+            startActivityForResult(i, SELECT_BARCODE_REQUEST);
+        }
     }
 
     class ColorSelectListener implements View.OnClickListener
     {
         final int defaultColor;
-        final boolean isBackgroundColor;
 
-        ColorSelectListener(int defaultColor, boolean isBackgroundColor)
+        ColorSelectListener(int defaultColor)
         {
             this.defaultColor = defaultColor;
-            this.isBackgroundColor = isBackgroundColor;
         }
 
         @Override
@@ -356,16 +401,9 @@ public class LoyaltyCardEditActivity extends AppCompatActivity
                 @Override
                 public void onColorSelected(int dialogId, int color)
                 {
-                    if(isBackgroundColor)
-                    {
-                        headingColorSample.setBackgroundColor(color);
-                        headingColorValue = color;
-                    }
-                    else
-                    {
-                        headingStoreTextColorSample.setBackgroundColor(color);
-                        headingStoreTextColorValue = color;
-                    }
+                    headingColorValue = color;
+
+                    generateIcon(storeFieldEdit.getText().toString());
                 }
 
                 @Override
@@ -387,7 +425,7 @@ public class LoyaltyCardEditActivity extends AppCompatActivity
 
         // We do not want to save the no barcode string to the database
         // it is simply an empty there for no barcode
-        if(barcodeType.equals(NO_BARCODE))
+        if(barcodeType.equals(getString(R.string.noBarcode)))
         {
             barcodeType = "";
         }
@@ -404,16 +442,25 @@ public class LoyaltyCardEditActivity extends AppCompatActivity
             return;
         }
 
+        List<Group> selectedGroups = new ArrayList<>();
+
+        for (Integer chipId : groupsChips.getCheckedChipIds()) {
+            Chip chip = groupsChips.findViewById(chipId);
+            selectedGroups.add((Group) chip.getTag());
+        }
+
         if(updateLoyaltyCard)
         {   //update of "starStatus" not necessary, since it cannot be changed in this activity (only in ViewActivity)
-            db.updateLoyaltyCard(loyaltyCardId, store, note, cardId, barcodeType, headingColorValue, headingStoreTextColorValue);
+            db.updateLoyaltyCard(loyaltyCardId, store, note, cardId, barcodeType, headingColorValue);
             Log.i(TAG, "Updated " + loyaltyCardId + " to " + cardId);
         }
         else
         {
-            loyaltyCardId = (int)db.insertLoyaltyCard(store, note, cardId, barcodeType, headingColorValue, headingStoreTextColorValue, 0);
+            loyaltyCardId = (int)db.insertLoyaltyCard(store, note, cardId, barcodeType, headingColorValue, 0);
         }
 
+        db.setLoyaltyCardGroups(loyaltyCardId, selectedGroups);
+
         finish();
     }
 
@@ -515,20 +562,61 @@ public class LoyaltyCardEditActivity extends AppCompatActivity
             cardIdView.setText(contents);
 
             // Set special NO_BARCODE value to prevent onResume from overwriting it
-            barcodeTypeField.setText(format.isEmpty() ? LoyaltyCardEditActivity.NO_BARCODE : format);
+            barcodeTypeField.setText(format.isEmpty() ? getString(R.string.noBarcode) : format);
             onResume();
         }
     }
 
     private void showBarcode() {
         barcodeImageLayout.setVisibility(View.VISIBLE);
-        findViewById(R.id.barcodeTypeDivider).setVisibility(View.VISIBLE);
-        findViewById(R.id.barcodeTypeTableRow).setVisibility(View.VISIBLE);
     }
 
     private void hideBarcode() {
         barcodeImageLayout.setVisibility(View.GONE);
-        findViewById(R.id.barcodeTypeDivider).setVisibility(View.GONE);
-        findViewById(R.id.barcodeTypeTableRow).setVisibility(View.GONE);
+    }
+
+    private void generateBarcode(final String cardId, final BarcodeFormat barcodeFormat) {
+        if (barcodeImage.getHeight() == 0) {
+            Log.d(TAG, "ImageView size is not known known at start, waiting for load");
+            // The size of the ImageView is not yet available as it has not
+            // yet been drawn. Wait for it to be drawn so the size is available.
+            barcodeImage.getViewTreeObserver().addOnGlobalLayoutListener(
+                    new ViewTreeObserver.OnGlobalLayoutListener() {
+                        @Override
+                        public void onGlobalLayout() {
+                            if (Build.VERSION.SDK_INT < 16) {
+                                barcodeImage.getViewTreeObserver().removeGlobalOnLayoutListener(this);
+                            } else {
+                                barcodeImage.getViewTreeObserver().removeOnGlobalLayoutListener(this);
+                            }
+
+                            Log.d(TAG, "ImageView size now known");
+                            new BarcodeImageWriterTask(barcodeImage, cardId, barcodeFormat).execute();
+                        }
+                    });
+        } else {
+            Log.d(TAG, "ImageView size known known, creating barcode");
+            new BarcodeImageWriterTask(barcodeImage, cardId, barcodeFormat).execute();
+        }
+
+        showBarcode();
+    }
+
+    private void generateIcon(String store) {
+        if (headingColorValue == null) {
+            return;
+        }
+
+        thumbnail.setBackgroundColor(headingColorValue);
+
+        LetterBitmap letterBitmap = Utils.generateIcon(this, store, headingColorValue);
+
+        if (letterBitmap != null) {
+            thumbnail.setImageBitmap(letterBitmap.getLetterTile());
+        } else {
+            thumbnail.setImageBitmap(null);
+        }
+
+        thumbnail.setMinimumWidth(thumbnail.getHeight());
     }
 }

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

@@ -1,6 +1,5 @@
 package protect.card_locker;
 
-
 import android.content.Intent;
 import android.content.pm.ActivityInfo;
 import android.graphics.Color;
@@ -9,7 +8,6 @@ import android.os.Build;
 import android.os.Bundle;
 
 import androidx.constraintlayout.widget.ConstraintLayout;
-import androidx.core.graphics.ColorUtils;
 import androidx.core.graphics.drawable.DrawableCompat;
 import androidx.core.widget.TextViewCompat;
 import androidx.appcompat.app.ActionBar;
@@ -34,11 +32,9 @@ import com.google.zxing.BarcodeFormat;
 
 import protect.card_locker.preferences.Settings;
 
-
 public class LoyaltyCardViewActivity extends AppCompatActivity
 {
     private static final String TAG = "Catima";
-    private static final double LUMINANCE_MIDPOINT = 0.5;
 
     TextView cardIdFieldView;
     TextView noteView;
@@ -201,17 +197,6 @@ public class LoyaltyCardViewActivity extends AppCompatActivity
         storeName.setText(loyaltyCard.store);
         storeName.setTextSize(settings.getCardTitleFontSize());
 
-        int textColor;
-        if(loyaltyCard.headerTextColor != null)
-        {
-            textColor = loyaltyCard.headerTextColor;
-        }
-        else
-        {
-            textColor = Color.WHITE;
-        }
-        storeName.setTextColor(textColor);
-
         int backgroundHeaderColor;
         if(loyaltyCard.headerColor != null)
         {
@@ -224,8 +209,19 @@ public class LoyaltyCardViewActivity extends AppCompatActivity
 
         collapsingToolbarLayout.setBackgroundColor(backgroundHeaderColor);
 
+        int textColor;
+        if(Utils.needsDarkForeground(backgroundHeaderColor))
+        {
+            textColor = Color.BLACK;
+        }
+        else
+        {
+            textColor = Color.WHITE;
+        }
+        storeName.setTextColor(textColor);
+
         // If the background is very bright, we should use dark icons
-        backgroundNeedsDarkIcons = (ColorUtils.calculateLuminance(backgroundHeaderColor) > LUMINANCE_MIDPOINT);
+        backgroundNeedsDarkIcons = Utils.needsDarkForeground(backgroundHeaderColor);
         ActionBar actionBar = getSupportActionBar();
         if(actionBar != null)
         {

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

@@ -11,6 +11,10 @@ import android.content.pm.PackageManager;
 import android.content.res.Configuration;
 import android.database.Cursor;
 import android.os.Bundle;
+import androidx.appcompat.app.AlertDialog;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.appcompat.widget.SearchView;
+import androidx.appcompat.widget.Toolbar;
 import android.util.Log;
 import android.view.ContextMenu;
 import android.view.Menu;
@@ -22,13 +26,12 @@ import android.widget.AdapterView;
 import android.widget.ListView;
 import android.widget.TextView;
 import android.widget.Toast;
-import androidx.appcompat.app.AlertDialog;
-import androidx.appcompat.app.AppCompatActivity;
-import androidx.appcompat.widget.SearchView;
-import androidx.appcompat.widget.Toolbar;
 import com.google.android.material.floatingactionbutton.FloatingActionButton;
+import com.google.android.material.tabs.TabLayout;
 import com.google.common.collect.ImmutableMap;
+
 import java.util.Calendar;
+import java.util.List;
 import java.util.Map;
 import protect.card_locker.preferences.SettingsActivity;
 
@@ -39,6 +42,7 @@ public class MainActivity extends AppCompatActivity
 
     private Menu menu;
     protected String filter = "";
+    protected int selectedTab = 0;
 
     @Override
     protected void onCreate(Bundle savedInstanceState)
@@ -48,7 +52,26 @@ public class MainActivity extends AppCompatActivity
         Toolbar toolbar = findViewById(R.id.toolbar);
         setSupportActionBar(toolbar);
 
-        updateLoyaltyCardList("");
+        updateLoyaltyCardList(filter, null);
+
+        TabLayout groupsTabLayout = findViewById(R.id.groups);
+        groupsTabLayout.addOnTabSelectedListener(new TabLayout.OnTabSelectedListener() {
+            @Override
+            public void onTabSelected(TabLayout.Tab tab) {
+                selectedTab = tab.getPosition();
+                updateLoyaltyCardList(filter, tab.getTag());
+            }
+
+            @Override
+            public void onTabUnselected(TabLayout.Tab tab) {
+
+            }
+
+            @Override
+            public void onTabReselected(TabLayout.Tab tab) {
+
+            }
+        });
     }
 
     @Override
@@ -64,7 +87,22 @@ public class MainActivity extends AppCompatActivity
             }
         }
 
-        updateLoyaltyCardList(filter);
+        TabLayout groupsTabLayout = findViewById(R.id.groups);
+        boolean hasReset = updateTabGroups(groupsTabLayout);
+
+        Object group = null;
+
+        if (groupsTabLayout.getTabCount() != 0) {
+            TabLayout.Tab tab = groupsTabLayout.getTabAt(0);
+
+            if (!hasReset) {
+                tab = groupsTabLayout.getTabAt(selectedTab);
+            }
+
+            groupsTabLayout.selectTab(tab);
+            group = tab.getTag();
+        }
+        updateLoyaltyCardList(filter, group);
 
         FloatingActionButton addButton = findViewById(R.id.fabAdd);
         addButton.setOnClickListener(new View.OnClickListener() {
@@ -109,17 +147,31 @@ public class MainActivity extends AppCompatActivity
         if (!searchView.isIconified()) {
             searchView.setIconified(true);
         } else {
-            super.onBackPressed();
+            TabLayout groupsTabLayout = findViewById(R.id.groups);
+
+            if (groupsTabLayout.getVisibility() == View.VISIBLE && selectedTab != 0) {
+                selectedTab = 0;
+                groupsTabLayout.selectTab(groupsTabLayout.getTabAt(0));
+            } else {
+                super.onBackPressed();
+            }
         }
     }
 
-    private void updateLoyaltyCardList(String filterText)
+    private void updateLoyaltyCardList(String filterText, Object tag)
     {
+        Group group = null;
+        if (tag != null) {
+            group = (Group) tag;
+        }
+
         final ListView cardList = findViewById(R.id.list);
         final TextView helpText = findViewById(R.id.helpText);
         final TextView noMatchingCardsText = findViewById(R.id.noMatchingCardsText);
         final DBHelper db = new DBHelper(this);
 
+        Cursor cardCursor = db.getLoyaltyCardCursor(filterText, group);
+
         if(db.getLoyaltyCardCount() > 0)
         {
             // We want the cardList to be visible regardless of the filtered match count
@@ -127,7 +179,7 @@ public class MainActivity extends AppCompatActivity
             // the keyboard
             cardList.setVisibility(View.VISIBLE);
             helpText.setVisibility(View.GONE);
-            if(db.getLoyaltyCardCount(filterText) > 0)
+            if(cardCursor.getCount() > 0)
             {
                 noMatchingCardsText.setVisibility(View.GONE);
             }
@@ -143,8 +195,6 @@ public class MainActivity extends AppCompatActivity
             noMatchingCardsText.setVisibility(View.GONE);
         }
 
-        Cursor cardCursor = db.getLoyaltyCardCursor(filterText);
-
         final LoyaltyCardCursorAdapter adapter = new LoyaltyCardCursorAdapter(this, cardCursor);
         cardList.setAdapter(adapter);
 
@@ -171,6 +221,53 @@ public class MainActivity extends AppCompatActivity
         });
     }
 
+    public boolean updateTabGroups(TabLayout groupsTabLayout)
+    {
+        final DBHelper db = new DBHelper(this);
+
+        List<Group> newGroups = db.getGroups();
+
+        if (newGroups.size() == 0) {
+            groupsTabLayout.removeAllTabs();
+            groupsTabLayout.setVisibility(View.GONE);
+            return true;
+        }
+
+        // -1 because there is an "All" tab
+        boolean isChanged = groupsTabLayout.getTabCount() - 1 != newGroups.size();
+
+        if (!isChanged) {
+            for (int i = 0; i < newGroups.size(); i++) {
+                if (!((Group) groupsTabLayout.getTabAt(i + 1).getTag())._id.equals(newGroups.get(i)._id)) {
+                    isChanged = true;
+                    break;
+                }
+            }
+        }
+
+        if (isChanged) {
+            groupsTabLayout.removeAllTabs();
+
+            TabLayout.Tab allTab = groupsTabLayout.newTab();
+            allTab.setText(R.string.all);
+            allTab.setTag(null);
+            groupsTabLayout.addTab(allTab);
+
+            for (Group group : newGroups) {
+                TabLayout.Tab tab = groupsTabLayout.newTab();
+                tab.setText(group._id);
+                tab.setTag(group);
+                groupsTabLayout.addTab(tab);
+            }
+
+            groupsTabLayout.setVisibility(View.VISIBLE);
+
+            return true;
+        }
+
+        return false;
+    }
+
     @Override
     public void onCreateContextMenu(ContextMenu menu, View v, ContextMenu.ContextMenuInfo menuInfo)
     {
@@ -240,7 +337,10 @@ public class MainActivity extends AppCompatActivity
                 @Override
                 public boolean onQueryTextChange(String newText) {
                     filter = newText;
-                    updateLoyaltyCardList(newText);
+
+                    TabLayout groupsTabLayout = findViewById(R.id.groups);
+
+                    updateLoyaltyCardList(newText, groupsTabLayout.getTabCount() > 0 ? groupsTabLayout.getTabAt(groupsTabLayout.getSelectedTabPosition()).getTag() : null);
                     return true;
                 }
             });
@@ -254,6 +354,13 @@ public class MainActivity extends AppCompatActivity
     {
         int id = item.getItemId();
 
+        if (id == R.id.action_manage_groups)
+        {
+            Intent i = new Intent(getApplicationContext(), ManageGroupsActivity.class);
+            startActivityForResult(i, MAIN_REQUEST_CODE);
+            return true;
+        }
+
         if(id == R.id.action_import_export)
         {
             Intent i = new Intent(getApplicationContext(), ImportExportActivity.class);
@@ -379,5 +486,4 @@ public class MainActivity extends AppCompatActivity
         int currentNightMode = config.uiMode & Configuration.UI_MODE_NIGHT_MASK;
         return (currentNightMode == Configuration.UI_MODE_NIGHT_YES);
     }
-
 }

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

@@ -0,0 +1,186 @@
+package protect.card_locker;
+
+import android.content.DialogInterface;
+import android.database.Cursor;
+import android.os.Bundle;
+import android.text.InputType;
+import android.view.MenuItem;
+import android.view.View;
+import android.widget.EditText;
+import android.widget.LinearLayout;
+import android.widget.ListView;
+import android.widget.TextView;
+
+import com.google.android.material.floatingactionbutton.FloatingActionButton;
+
+import androidx.appcompat.app.ActionBar;
+import androidx.appcompat.app.AlertDialog;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.appcompat.widget.Toolbar;
+
+public class ManageGroupsActivity extends AppCompatActivity
+{
+    private static final String TAG = "Catima";
+
+    private AlertDialog newGroupDialog;
+    private final DBHelper db = new DBHelper(this);
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState)
+    {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.manage_groups_activity);
+        Toolbar toolbar = findViewById(R.id.toolbar);
+        setSupportActionBar(toolbar);
+        ActionBar actionBar = getSupportActionBar();
+        if(actionBar != null)
+        {
+            actionBar.setDisplayHomeAsUpEnabled(true);
+        }
+
+        newGroupDialog = createNewGroupDialog();
+
+        updateGroupList();
+    }
+
+    @Override
+    protected void onResume() {
+        super.onResume();
+
+        updateGroupList();
+
+        FloatingActionButton addButton = findViewById(R.id.fabAdd);
+        addButton.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                newGroupDialog.show();
+            }
+        });
+    }
+
+    @Override
+    public void onBackPressed() {
+        super.onBackPressed();
+    }
+
+    private void updateGroupList()
+    {
+        final ListView groupList = findViewById(R.id.list);
+        final TextView helpText = findViewById(R.id.helpText);
+        final DBHelper db = new DBHelper(this);
+
+        if(db.getGroupCount() > 0)
+        {
+            groupList.setVisibility(View.VISIBLE);
+            helpText.setVisibility(View.GONE);
+        }
+        else
+        {
+            groupList.setVisibility(View.GONE);
+            helpText.setVisibility(View.VISIBLE);
+        }
+
+        Cursor groupCursor = db.getGroupCursor();
+
+        final GroupCursorAdapter adapter = new GroupCursorAdapter(this, groupCursor);
+        groupList.setAdapter(adapter);
+
+        registerForContextMenu(groupList);
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item)
+    {
+        int id = item.getItemId();
+
+        if (id == android.R.id.home) {
+            finish();
+        }
+
+        return super.onOptionsItemSelected(item);
+    }
+
+    public void editGroup(View view) {
+        LinearLayout parentRow = (LinearLayout) view.getParent();
+
+        TextView groupNameTextView = (TextView) parentRow.findViewById(R.id.name);
+
+        final String groupName = (String) groupNameTextView.getText();
+
+        AlertDialog.Builder builder = new AlertDialog.Builder(this);
+        builder.setTitle(R.string.enter_group_name);
+        final EditText input = new EditText(this);
+        input.setInputType(InputType.TYPE_CLASS_TEXT);
+        input.setText(groupName);
+        builder.setView(input);
+
+        builder.setPositiveButton(getString(R.string.ok), new DialogInterface.OnClickListener() {
+            @Override
+            public void onClick(DialogInterface dialog, int which) {
+                db.updateGroup(groupName, input.getText().toString());
+                updateGroupList();
+            }
+        });
+        builder.setNegativeButton(getString(R.string.cancel), new DialogInterface.OnClickListener() {
+            @Override
+            public void onClick(DialogInterface dialog, int which) {
+                dialog.cancel();
+            }
+        });
+        AlertDialog dialog = builder.create();
+        dialog.show();
+    }
+
+    public void deleteGroup(View view) {
+        LinearLayout parentRow = (LinearLayout) view.getParent();
+
+        TextView groupNameTextView = (TextView) parentRow.findViewById(R.id.name);
+
+        final String groupName = (String) groupNameTextView.getText();
+
+        AlertDialog.Builder builder = new AlertDialog.Builder(this);
+        builder.setTitle(R.string.deleteConfirmationGroup);
+        builder.setMessage(groupName);
+
+        builder.setPositiveButton(getString(R.string.ok), new DialogInterface.OnClickListener() {
+            @Override
+            public void onClick(DialogInterface dialog, int which) {
+                db.deleteGroup(groupName);
+                updateGroupList();
+            }
+        });
+        builder.setNegativeButton(getString(R.string.cancel), new DialogInterface.OnClickListener() {
+            @Override
+            public void onClick(DialogInterface dialog, int which) {
+                dialog.cancel();
+            }
+        });
+        AlertDialog dialog = builder.create();
+        dialog.show();
+    }
+
+    private AlertDialog createNewGroupDialog() {
+        AlertDialog.Builder builder = new AlertDialog.Builder(this);
+        builder.setTitle(R.string.enter_group_name);
+        final EditText input = new EditText(this);
+        input.setInputType(InputType.TYPE_CLASS_TEXT);
+        builder.setView(input);
+
+        builder.setPositiveButton(getString(R.string.ok), new DialogInterface.OnClickListener() {
+            @Override
+            public void onClick(DialogInterface dialog, int which) {
+                db.insertGroup(input.getText().toString());
+                updateGroupList();
+            }
+        });
+        builder.setNegativeButton(getString(R.string.cancel), new DialogInterface.OnClickListener() {
+            @Override
+            public void onClick(DialogInterface dialog, int which) {
+                dialog.cancel();
+            }
+        });
+        AlertDialog dialog = builder.create();
+
+        return dialog;
+    }
+}

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

@@ -0,0 +1,26 @@
+package protect.card_locker;
+
+import android.content.Context;
+import android.graphics.Color;
+
+import androidx.core.graphics.ColorUtils;
+
+public class Utils {
+    static final double LUMINANCE_MIDPOINT = 0.5;
+
+    static public LetterBitmap generateIcon(Context context, String store, Integer backgroundColor) {
+        if (store.length() == 0) {
+            return null;
+        }
+
+        int tileLetterFontSize = context.getResources().getDimensionPixelSize(R.dimen.tileLetterFontSize);
+        int pixelSize = context.getResources().getDimensionPixelSize(R.dimen.cardThumbnailSize);
+
+        return new LetterBitmap(context, store, store,
+                tileLetterFontSize, pixelSize, pixelSize, backgroundColor, needsDarkForeground(backgroundColor) ? Color.BLACK : Color.WHITE);
+    }
+
+    static public boolean needsDarkForeground(Integer backgroundColor) {
+        return ColorUtils.calculateLuminance(backgroundColor) > LUMINANCE_MIDPOINT;
+    }
+}

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

@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:orientation="horizontal"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:gravity="center_vertical"
+    android:baselineAligned="false"
+    android:padding="@dimen/activity_margin">
+
+    <LinearLayout
+        android:orientation="vertical"
+        android:layout_width="0dip"
+        android:layout_height="wrap_content"
+        android:layout_weight="1">
+
+        <LinearLayout
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content" >
+
+            <LinearLayout
+                android:id="@+id/valueLayout"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:visibility="visible">
+
+                <TextView
+                    android:id="@+id/name"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:textSize="@dimen/storeNameTextSize"
+                    android:textStyle="bold"/>
+
+            </LinearLayout>
+
+        </LinearLayout>
+
+        <TextView
+            android:id="@+id/cardCount"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:maxLines="1"
+            android:ellipsize="end"
+            android:textSize="@dimen/noteTextSize"/>
+    </LinearLayout>
+
+    <ImageButton
+        android:id="@+id/edit"
+        android:layout_width="@dimen/cardThumbnailSize"
+        android:layout_height="@dimen/cardThumbnailSize"
+        android:layout_marginLeft="@dimen/activity_margin"
+        android:src="@drawable/ic_mode_edit_white_24dp"
+        android:contentDescription="@string/edit"
+        app:tint="#000000"
+        android:onClick="editGroup" />
+
+    <ImageButton
+        android:id="@+id/delete"
+        android:layout_width="@dimen/cardThumbnailSize"
+        android:layout_height="@dimen/cardThumbnailSize"
+        android:layout_marginLeft="@dimen/activity_margin"
+        android:src="@drawable/ic_delete_white_24dp"
+        android:contentDescription="@string/delete"
+        app:tint="#000000"
+        android:onClick="deleteGroup"/>
+
+</LinearLayout>

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

@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout
+    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"
+    app:layout_behavior="@string/appbar_scrolling_view_behavior"
+    tools:context="protect.card_locker.MainActivity"
+    tools:showIn="@layout/main_activity">
+
+    <TextView
+        style="@style/AppTheme.TextView.NoData"
+        android:id="@+id/helpText"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/noGroups"
+        android:visibility="gone"/>
+
+    <ListView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:id="@+id/list"
+        android:visibility="gone"/>
+</RelativeLayout>

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

@@ -0,0 +1,9 @@
+<com.google.android.material.chip.Chip xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:paddingLeft="8dp"
+    android:paddingRight="8dp"
+    style="@style/Widget.MaterialComponents.Chip.Choice"
+    app:checkedIconVisible="true"
+    android:textAppearance="?android:attr/textAppearance" />

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

@@ -32,420 +32,191 @@
                 android:layout_height="wrap_content"
                 android:background="@color/inputContrastBackground"
                 app:layout_behavior="com.google.android.material.appbar.AppBarLayout$ScrollingViewBehavior">
-        <LinearLayout
+        <TableLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:orientation="vertical">
-            <TableLayout android:layout_width="fill_parent"
-                         android:layout_height="wrap_content"
-                         android:shrinkColumns="1"
-                         android:background="@color/inputContrastBackground">
 
-                <!-- Store Name -->
-                <View
-                    android:layout_height="@dimen/inputBorderThickness"
-                    android:layout_width="match_parent"
-                    android:background="@color/inputBorder" />
-                <TableRow
-                    android:background="@color/inputBackground"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content">
-                    <View
-                        android:gravity="start"
-                        android:layout_height="match_parent"
-                        android:layout_width="@dimen/inputBorderThickness"
-                        android:background="@color/inputBorder" />
+            <!-- Store -->
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:paddingHorizontal="@dimen/inputPadding"
+                android:paddingTop="@dimen/inputPadding"
+                android:orientation="horizontal">
 
-                    <RelativeLayout
-                        android:layout_weight="1"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:paddingRight="@dimen/inputPadding"
-                        android:paddingEnd="@dimen/inputPadding">
+                <androidx.cardview.widget.CardView
+                    android:layout_width="@dimen/cardThumbnailSize"
+                    android:layout_height="@dimen/cardThumbnailSize"
+                    android:layout_marginEnd="@dimen/activity_margin"
+                    android:layout_marginRight="@dimen/activity_margin"
+                    android:layout_gravity="center_vertical"
+                    app:cardCornerRadius="4dp"
+                    android:paddingHorizontal="@dimen/inputPadding"
+                    app:cardElevation="0dp">
 
-                        <TextView
-                            android:id="@+id/storeNameField"
-                            android:text="@string/storeName"
-                            android:layout_height="match_parent"
-                            android:layout_width="wrap_content"
-                            android:textSize="@dimen/inputSize"
-                            android:padding="@dimen/inputPadding"
-                            android:layout_alignParentStart="true"
-                            android:layout_alignParentLeft="true"/>
-
-                        <EditText
-                            android:id="@+id/storeNameEdit"
-                            android:inputType="textCapWords"
-                            android:layout_height="wrap_content"
-                            android:layout_width="match_parent"
-                            android:padding="@dimen/inputPadding"
-                            android:textSize="@dimen/inputSize"
-                            android:layout_toEndOf="@id/storeNameField"
-                            android:layout_toRightOf="@id/storeNameField"
-                            />
-
-                    </RelativeLayout>
-
-                    <View
-                        android:gravity="end"
-                        android:layout_height="match_parent"
-                        android:layout_width="@dimen/inputBorderThickness"
-                        android:background="@color/inputBorder" />
-                </TableRow>
-
-                <!-- Note -->
-                <View
-                    android:layout_height="@dimen/inputBorderThickness"
-                    android:layout_width="match_parent"
-                    android:background="@color/inputBorder" />
-                <TableRow
-                    android:background="@color/inputBackground"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content">
-                    <View
-                        android:gravity="start"
-                        android:layout_height="match_parent"
-                        android:layout_width="@dimen/inputBorderThickness"
-                        android:background="@color/inputBorder" />
-
-                    <RelativeLayout
-                        android:layout_weight="1"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:paddingRight="@dimen/inputPadding"
-                        android:paddingEnd="@dimen/inputPadding">
-
-                        <TextView
-                            android:id="@+id/noteField"
-                            android:text="@string/note"
-                            android:layout_height="match_parent"
-                            android:layout_width="wrap_content"
-                            android:textSize="@dimen/inputSize"
-                            android:padding="@dimen/inputPadding"
-                            android:layout_alignParentStart="true"
-                            android:layout_alignParentLeft="true"
-                            />
-
-                        <EditText
-                            android:id="@+id/noteEdit"
-                            android:inputType="textMultiLine"
-                            android:layout_height="wrap_content"
-                            android:layout_width="match_parent"
-                            android:padding="@dimen/inputPadding"
-                            android:textSize="@dimen/inputSize"
-                            android:layout_toEndOf="@id/noteField"
-                            android:layout_toRightOf="@id/noteField"
-                            />
-                    </RelativeLayout>
-
-                    <View
-                        android:gravity="end"
-                        android:layout_height="match_parent"
-                        android:layout_width="@dimen/inputBorderThickness"
-                        android:background="@color/inputBorder" />
-                </TableRow>
-
-                <!-- Store Header Background Color -->
-                <View
-                    android:layout_height="@dimen/inputBorderThickness"
-                    android:layout_width="match_parent"
-                    android:background="@color/inputBorder" />
-                <TableRow
-                    android:background="@color/inputBackground"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content">
-                    <View
-                        android:gravity="start"
-                        android:layout_height="match_parent"
-                        android:layout_width="@dimen/inputBorderThickness"
-                        android:background="@color/inputBorder" />
-
-                    <androidx.constraintlayout.widget.ConstraintLayout
-                        android:layout_weight="1"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:paddingRight="@dimen/inputPadding"
-                        android:paddingEnd="@dimen/inputPadding">
-
-                        <TextView
-                            android:id="@+id/headingField"
-                            android:text="@string/storeTextBackgroundColorTitle"
-                            android:layout_height="match_parent"
-                            android:layout_width="wrap_content"
-                            android:textSize="@dimen/inputSize"
-                            android:padding="@dimen/inputPadding"
-                            app:layout_constraintStart_toStartOf="parent"/>
-
-                        <androidx.constraintlayout.widget.ConstraintLayout
-                            android:id="@+id/headingColorSampleBorder"
-                            android:layout_width="0dp"
-                            android:layout_height="0dp"
-                            android:layout_margin="@dimen/colorSamplePadding"
-                            app:layout_constraintStart_toEndOf="@id/headingField"
-                            app:layout_constraintEnd_toStartOf="@+id/headingColorSelectButton"
-                            app:layout_constraintTop_toTopOf="parent"
-                            app:layout_constraintBottom_toBottomOf="parent"
-                            android:background="@android:color/black">
-                            <ImageView
-                                android:id="@+id/headingColorSample"
-                                android:layout_width="0dp"
-                                android:layout_height="0dp"
-                                android:layout_margin="1dp"
-                                app:layout_constraintStart_toStartOf="parent"
-                                app:layout_constraintEnd_toEndOf="parent"
-                                app:layout_constraintTop_toTopOf="parent"
-                                app:layout_constraintBottom_toBottomOf="parent"
-                                android:background="@android:color/white"
-                                android:contentDescription="@string/storeNameBackgroundColorDescription"/>
-                        </androidx.constraintlayout.widget.ConstraintLayout>
-
-                       <Button
-                           android:id="@+id/headingColorSelectButton"
-                           android:text="@string/change"
-                           android:padding="@dimen/inputPadding"
-                           android:layout_width="wrap_content"
-                           android:layout_height="match_parent"
-                           android:layout_toEndOf="@id/headingColorSampleBorder"
-                           android:layout_toRightOf="@id/headingColorSampleBorder"
-                           app:layout_constraintEnd_toEndOf="parent"/>
-                    </androidx.constraintlayout.widget.ConstraintLayout>
-
-                    <View
-                        android:gravity="end"
-                        android:layout_height="match_parent"
-                        android:layout_width="@dimen/inputBorderThickness"
-                        android:background="@color/inputBorder" />
-                </TableRow>
-
-                <!-- Store Text Color -->
-                <View
-                    android:layout_height="@dimen/inputBorderThickness"
-                    android:layout_width="match_parent"
-                    android:background="@color/inputBorder" />
-                <TableRow
-                    android:background="@color/inputBackground"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content">
-                    <View
-                        android:gravity="start"
-                        android:layout_height="match_parent"
-                        android:layout_width="@dimen/inputBorderThickness"
-                        android:background="@color/inputBorder" />
-
-                    <androidx.constraintlayout.widget.ConstraintLayout
-                        android:layout_weight="1"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:paddingRight="@dimen/inputPadding"
-                        android:paddingEnd="@dimen/inputPadding">
-
-                        <TextView
-                            android:id="@+id/storeTextField"
-                            android:text="@string/storeTextColorTitle"
-                            android:layout_height="match_parent"
-                            android:layout_width="wrap_content"
-                            android:textSize="@dimen/inputSize"
-                            android:padding="@dimen/inputPadding"
-                            app:layout_constraintStart_toStartOf="parent"/>
-
-                        <androidx.constraintlayout.widget.ConstraintLayout
-                            android:id="@+id/headingStoreTextColorSampleBorder"
-                            android:layout_width="0dp"
-                            android:layout_height="0dp"
-                            android:layout_margin="@dimen/colorSamplePadding"
-                            app:layout_constraintStart_toEndOf="@id/storeTextField"
-                            app:layout_constraintEnd_toStartOf="@+id/headingStoreTextColorSelectButton"
-                            app:layout_constraintTop_toTopOf="parent"
-                            app:layout_constraintBottom_toBottomOf="parent"
-                            android:background="@android:color/black">
-                            <ImageView
-                                android:id="@+id/headingStoreTextColorSample"
-                                android:layout_width="0dp"
-                                android:layout_height="0dp"
-                                android:layout_margin="1dp"
-                                app:layout_constraintStart_toStartOf="parent"
-                                app:layout_constraintEnd_toEndOf="parent"
-                                app:layout_constraintTop_toTopOf="parent"
-                                app:layout_constraintBottom_toBottomOf="parent"
-                                android:background="@android:color/white"
-                                android:contentDescription="@string/storeNameColorDescription"/>
-                        </androidx.constraintlayout.widget.ConstraintLayout>
-
-                        <Button
-                            android:id="@+id/headingStoreTextColorSelectButton"
-                            android:text="@string/change"
-                            android:padding="@dimen/inputPadding"
-                            android:layout_width="wrap_content"
-                            android:layout_height="match_parent"
-                            android:layout_toEndOf="@id/headingStoreTextColorSampleBorder"
-                            android:layout_toRightOf="@id/headingStoreTextColorSampleBorder"
-                            app:layout_constraintEnd_toEndOf="parent"/>
-                    </androidx.constraintlayout.widget.ConstraintLayout>
-
-                    <View
-                        android:gravity="end"
-                        android:layout_height="match_parent"
-                        android:layout_width="@dimen/inputBorderThickness"
-                        android:background="@color/inputBorder" />
-                </TableRow>
-
-                <!-- Card ID -->
-                <View
-                    android:id="@+id/cardIdDivider"
-                    android:layout_height="@dimen/inputBorderThickness"
-                    android:layout_width="match_parent"
-                    android:background="@color/inputBorder" />
-                <TableRow
-                    android:id="@+id/cardIdTableRow"
-                    android:background="@color/inputBackground"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content">
-                    <View
-                        android:gravity="start"
-                        android:layout_height="match_parent"
-                        android:layout_width="@dimen/inputBorderThickness"
-                        android:background="@color/inputBorder" />
-
-                    <RelativeLayout
-                        android:orientation="horizontal"
-                        android:layout_weight="1"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:paddingRight="@dimen/inputPadding"
-                        android:paddingEnd="@dimen/inputPadding">
-
-                        <TextView
-                            android:id="@+id/cardIdField"
-                            android:text="@string/cardId"
-                            android:layout_height="match_parent"
-                            android:layout_width="wrap_content"
-                            android:textSize="@dimen/inputSize"
-                            android:padding="@dimen/inputPadding"
-                            android:layout_alignParentStart="true"
-                            android:layout_alignParentLeft="true"
-                            />
-
-                        <TextView
-                            android:id="@+id/cardIdView"
-                            android:layout_height="wrap_content"
-                            android:layout_width="match_parent"
-                            android:padding="@dimen/inputPadding"
-                            android:textSize="@dimen/inputSize"
-                            android:textIsSelectable="true"
-                            android:layout_toEndOf="@id/cardIdField"
-                            android:layout_toRightOf="@id/cardIdField"
-                            />
-                    </RelativeLayout>
-
-                    <View
-                        android:gravity="end"
-                        android:layout_height="match_parent"
-                        android:layout_width="@dimen/inputBorderThickness"
-                        android:background="@color/inputBorder" />
-                </TableRow>
-
-                <!-- Barcode Type -->
-                <View
-                    android:id="@+id/barcodeTypeDivider"
-                    android:layout_height="@dimen/inputBorderThickness"
-                    android:layout_width="match_parent"
-                    android:background="@color/inputBorder" />
-                <TableRow
-                    android:id="@+id/barcodeTypeTableRow"
-                    android:background="@color/inputBackground"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content">
-                    <View
-                        android:gravity="start"
-                        android:layout_height="match_parent"
-                        android:layout_width="@dimen/inputBorderThickness"
-                        android:background="@color/inputBorder" />
-
-                    <RelativeLayout
-                        android:orientation="horizontal"
-                        android:layout_weight="1"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:paddingRight="@dimen/inputPadding"
-                        android:paddingEnd="@dimen/inputPadding">
-
-                        <TextView
-                            android:id="@+id/barcodeTypeField"
-                            android:text="@string/barcodeType"
-                            android:layout_height="match_parent"
-                            android:layout_width="wrap_content"
-                            android:textSize="@dimen/inputSize"
-                            android:padding="@dimen/inputPadding"
-                            android:layout_alignParentStart="true"
-                            android:layout_alignParentLeft="true"
-                            />
-
-                        <TextView
-                            android:id="@+id/barcodeTypeView"
-                            android:layout_height="wrap_content"
-                            android:layout_width="match_parent"
-                            android:padding="@dimen/inputPadding"
-                            android:textSize="@dimen/inputSize"
-                            android:textIsSelectable="true"
-                            android:layout_toEndOf="@id/barcodeTypeField"
-                            android:layout_toRightOf="@id/barcodeTypeField"
-                            />
-                    </RelativeLayout>
-
-                    <View
-                        android:gravity="end"
-                        android:layout_height="match_parent"
-                        android:layout_width="@dimen/inputBorderThickness"
-                        android:background="@color/inputBorder" />
-                </TableRow>
-
-                <View
-                    android:layout_height="@dimen/inputBorderThickness"
-                    android:layout_width="match_parent"
-                    android:background="@color/inputBorder" />
-
-                <LinearLayout android:orientation="horizontal"
-                              android:padding="10.0dip"
-                              android:layout_width="fill_parent"
-                              android:layout_height="wrap_content"
-                              android:visibility="gone"
-                              android:id="@+id/barcodeLayout">
                     <ImageView
-                        android:layout_width="0dp"
-                        android:layout_height="@dimen/barcode_disp_height"
-                        android:layout_gravity="center_horizontal"
-                        android:padding="10.0dp"
-                        android:background="#ffffff"
-                        android:id="@+id/barcode"
-                        android:contentDescription="@string/barcodeImageDescription"
-                        android:layout_weight="1.0"/>
-                </LinearLayout>
+                        android:id="@+id/thumbnail"
+                        android:layout_width="@dimen/cardThumbnailSize"
+                        android:layout_height="@dimen/cardThumbnailSize"
+                        android:contentDescription="@string/thumbnailDescription"
+                        android:src="@mipmap/ic_launcher"/>
+
+                </androidx.cardview.widget.CardView>
+
+                <com.google.android.material.textfield.TextInputLayout
+                    android:id="@+id/storeNameField"
+                    style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:hint="@string/storeName">
+
+                    <com.google.android.material.textfield.TextInputEditText
+                        android:id="@+id/storeNameEdit"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        />
+
+                </com.google.android.material.textfield.TextInputLayout>
+            </LinearLayout>
+
+            <!-- Note -->
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:paddingHorizontal="@dimen/inputPadding"
+                android:paddingTop="@dimen/inputPadding"
+                android:orientation="horizontal">
+
+                <com.google.android.material.textfield.TextInputLayout
+                    android:id="@+id/noteField"
+                    style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:hint="@string/note">
+
+                    <com.google.android.material.textfield.TextInputEditText
+                        android:id="@+id/noteEdit"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        />
+
+                </com.google.android.material.textfield.TextInputLayout>
+            </LinearLayout>
+
+            <!-- Group -->
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:paddingHorizontal="@dimen/inputPadding"
+                android:paddingTop="@dimen/inputPadding"
+                android:orientation="horizontal">
+
+                <com.google.android.material.chip.ChipGroup
+                    android:id="@+id/groupChips"
+                    android:layout_height="match_parent"
+                    android:layout_width="match_parent"
+                    android:padding="@dimen/inputPadding"
+                    android:textSize="@dimen/inputSize" />
+            </LinearLayout>
+
+            <!-- Buttons -->
+            <TableLayout android:layout_width="fill_parent"
+                android:layout_height="wrap_content"
+                android:shrinkColumns="1"
+                android:background="@color/inputContrastBackground">
 
                 <LinearLayout android:orientation="vertical"
-                              android:layout_width="fill_parent"
-                              android:layout_height="wrap_content"
-                              android:background="@color/inputBackground">
+                    android:layout_width="fill_parent"
+                    android:layout_height="wrap_content"
+                    android:background="@color/inputBackground">
 
                     <LinearLayout android:orientation="horizontal"
-                                  android:padding="10.0dip"
-                                  android:layout_width="fill_parent"
-                                  android:layout_height="wrap_content"
-                                  android:id="@+id/barcodeCaptureLayout">
+                        android:padding="10.0dip"
+                        android:layout_width="fill_parent"
+                        android:layout_height="wrap_content"
+                        android:id="@+id/barcodeCaptureLayout">
                         <Button android:id="@+id/captureButton"
-                                android:layout_width="0dp"
-                                android:layout_height="wrap_content"
-                                android:text="@string/capture"
-                                android:layout_weight="1.0"/>
+                            android:layout_margin="@dimen/inputMargin"
+                            android:layout_width="0dp"
+                            android:layout_height="wrap_content"
+                            android:text="@string/capture"
+                            android:layout_weight="1.0"/>
                         <Button android:id="@+id/enterButton"
-                                android:layout_width="0dp"
-                                android:layout_height="wrap_content"
-                                android:text="@string/enterCard"
-                                android:layout_weight="1.0"/>
+                            android:layout_margin="@dimen/inputMargin"
+                            android:layout_width="0dp"
+                            android:layout_height="wrap_content"
+                            android:text="@string/enterCard"
+                            android:layout_weight="1.0"/>
                     </LinearLayout>
                 </LinearLayout>
-
             </TableLayout>
-        </LinearLayout>
+
+            <!-- Card ID and Barcode type -->
+            <LinearLayout
+                android:id="@+id/cardAndBarcodeLayout"
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content"
+                android:paddingHorizontal="@dimen/inputPadding"
+                android:paddingTop="@dimen/inputPadding"
+                android:orientation="horizontal">
+
+                <!-- Card ID -->
+                <com.google.android.material.textfield.TextInputLayout
+                    android:id="@+id/cardIdField"
+                    style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1.0"
+                    android:hint="@string/cardId">
+
+                    <com.google.android.material.textfield.TextInputEditText
+                        android:id="@+id/cardIdView"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        />
+
+                </com.google.android.material.textfield.TextInputLayout>
+
+                <!-- Barcode type -->
+                <com.google.android.material.textfield.TextInputLayout
+                    android:id="@+id/barcodeTypeView"
+                    style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.ExposedDropdownMenu"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1.0"
+                    android:hint="@string/barcodeType">
+
+                    <AutoCompleteTextView
+                        android:id="@+id/barcodeTypeField"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:inputType="none"/>
+                </com.google.android.material.textfield.TextInputLayout>
+            </LinearLayout>
+
+            <!-- Barcode -->
+            <View
+                android:layout_height="@dimen/inputBorderThickness"
+                android:layout_width="match_parent" />
+
+            <LinearLayout android:orientation="horizontal"
+                          android:padding="10.0dip"
+                          android:layout_width="fill_parent"
+                          android:layout_height="wrap_content"
+                          android:visibility="gone"
+                          android:id="@+id/barcodeLayout">
+                <ImageView
+                    android:layout_width="0dp"
+                    android:layout_height="@dimen/barcode_disp_height"
+                    android:layout_gravity="center_horizontal"
+                    android:padding="10.0dp"
+                    android:background="#ffffff"
+                    android:id="@+id/barcode"
+                    android:contentDescription="@string/barcodeImageDescription"
+                    android:layout_weight="1.0"/>
+            </LinearLayout>
+        </TableLayout>
     </ScrollView>
 
 </androidx.coordinatorlayout.widget.CoordinatorLayout>

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

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:orientation="horizontal"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
@@ -8,14 +8,22 @@
     android:baselineAligned="false"
     android:padding="@dimen/activity_margin">
 
-    <ImageView
-        android:id="@+id/thumbnail"
+    <androidx.cardview.widget.CardView
         android:layout_width="@dimen/cardThumbnailSize"
         android:layout_height="@dimen/cardThumbnailSize"
         android:layout_marginEnd="@dimen/activity_margin"
         android:layout_marginRight="@dimen/activity_margin"
-        android:src="@mipmap/ic_launcher"
-        android:contentDescription="@string/thumbnailDescription"/>
+        app:cardCornerRadius="4dp"
+        app:cardElevation="0dp">
+
+        <ImageView
+            android:id="@+id/thumbnail"
+            android:layout_width="@dimen/cardThumbnailSize"
+            android:layout_height="@dimen/cardThumbnailSize"
+            android:contentDescription="@string/thumbnailDescription"
+            android:src="@mipmap/ic_launcher"/>
+
+    </androidx.cardview.widget.CardView>
 
     <LinearLayout
         android:orientation="vertical"

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

@@ -29,6 +29,13 @@
             android:background="?attr/colorPrimary"
             app:popupTheme="@style/AppTheme.PopupOverlay"/>
 
+        <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"/>

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

@@ -0,0 +1,36 @@
+<?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.floatingactionbutton.FloatingActionButton
+        android:id="@+id/fabAdd"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="end|bottom"
+        android:src="@drawable/ic_add_white_24dp"
+        android:contentDescription="@string/action_add"
+        android:layout_margin="16dp" />
+
+    <com.google.android.material.appbar.AppBarLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:theme="@style/AppTheme.AppBarOverlay">
+
+        <androidx.appcompat.widget.Toolbar
+            android:id="@+id/toolbar"
+            android:layout_width="match_parent"
+            android:layout_height="?attr/actionBarSize"
+            android:background="?attr/colorPrimary"
+            app:popupTheme="@style/AppTheme.PopupOverlay"/>
+
+    </com.google.android.material.appbar.AppBarLayout>
+
+    <include layout="@layout/group_main"/>
+
+</androidx.coordinatorlayout.widget.CoordinatorLayout>

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

@@ -8,6 +8,11 @@
         android:icon="@drawable/ic_search_white"
         app:actionViewClass="androidx.appcompat.widget.SearchView"
         app:showAsAction="always|collapseActionView"/>
+    <item
+        android:id="@+id/action_manage_groups"
+        android:icon="@drawable/ic_folder_white"
+        android:title="@string/groups"
+        app:showAsAction="always"/>
     <item
         android:id="@+id/action_import_export"
         android:icon="@drawable/ic_import_export_white_24dp"

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

@@ -3,7 +3,7 @@
     <string name="action_search">Suche</string>
     <string name="action_add">Neu</string>
     <string name="noGiftCards">Sie haben noch keine Kundenkarte angelegt. Über den \"+\"-Button oben rechts können welche angelegt werden.\n\nDiese App ermöglicht es, Kundenkarten immer mit zu führen.</string>
-    <string name="noMatchingGiftCards">Es passen keine Kundenkarten zum Suchfilter. Bitte probiere verschiedene Begriffe aus.</string>
+    <string name="noMatchingGiftCards">Es passen keine Kundenkarten zum Filter. Bitte probiere verschiedene Begriffe aus.</string>
     <string name="storeName">Geschäft</string>
     <string name="note">Notiz</string>
     <string name="cardId">Kartennummer</string>
@@ -49,7 +49,7 @@
     <string name="importOptionFilesystemTitle">Importiere aus Dateisystem</string>
     <string name="importOptionFilesystemExplanation">Wähle eine Datei aus dem Speicher aus.</string>
     <string name="importOptionFilesystemButton">Aus Dateisystem</string>
-    <string name="importOptionApplicationTitle">Externe App verwenden</string>
+    <string name="importOptionApplicationTitle">Externe Anwendung verwenden</string>
     <string name="importOptionApplicationExplanation">Wählen Sie eine Datei aus einer App wie Dropbox, Google Drive, oder Ihrem bevorzugten Dateisystem aus.</string>
     <string name="importOptionApplicationButton">Nutze eine externe App</string>
     <string name="about">Über</string>
@@ -91,4 +91,13 @@
     <string name="share">Teilen</string>
     <string name="barcodeNoBarcode">Diese Karte hat keinen Strichcode</string>
     <string name="barcodeType">Strichcode-Typ</string>
-</resources>
+    <string name="starImage">Favoritenstern</string>
+    <string name="deleteConfirmationGroup">Bitte bestätigen Sie, dass Sie diese Gruppe löschen möchten</string>
+    <string name="all">Alle</string>
+    <string name="groupCardCount">&lt;xliff:g xmlns:xliff=\"urn:oasis:names:tc:xliff:document:1.2\"&gt;%d&lt;/xliff:g&gt; Karten</string>
+    <string name="noGroups">Sie haben im Moment keine Gruppen. Klicken Sie auf die Schaltfläche + (Plus), um loszulegen.
+\n
+\nKarten können Gruppen zugewiesen werden, um sie leichter zu finden.</string>
+    <string name="groups">Gruppen</string>
+    <string name="enter_group_name">Geben Sie den Gruppennamen ein</string>
+</resources>

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

@@ -45,7 +45,7 @@
     <string name="importOptionFilesystemTitle">Importer depuis le système de fichiers</string>
     <string name="importOptionFilesystemExplanation">Choisissez le fichier à importer.</string>
     <string name="importOptionFilesystemButton">Système de fichiers</string>
-    <string name="importOptionApplicationTitle">Application externe</string>
+    <string name="importOptionApplicationTitle">Utiliser une application externe</string>
     <string name="importOptionApplicationExplanation">Utilisez une application externe comme Dropbox, Google Drive, ou votre gestionnaire de fichiers favori pour ouvrir un fichier.</string>
     <string name="importOptionApplicationButton">Application externe</string>
     <string name="about">À propos</string>
@@ -87,6 +87,17 @@
     <string name="share">Partager</string>
     <string name="barcodeNoBarcode">Cette carte n\'a pas de code-barres</string>
     <string name="barcodeType">Type de code-barres</string>
-    <string name="noMatchingGiftCards">Aucune carte ne correspond au filtre de recherche. Veuillez essayer d\'autres termes.</string>
+    <string name="noMatchingGiftCards">Aucune carte ne correspond au filtre. Veuillez essayer d\'autres termes.</string>
     <string name="action_search">Rechercher</string>
-</resources>
+    <string name="unstar">Retirer des favoris</string>
+    <string name="star">Ajouter aux favoris</string>
+    <string name="starImage">Étoile favorite</string>
+    <string name="deleteConfirmationGroup">Confirmez que vous voulez supprimer cette carte</string>
+    <string name="all">Tous</string>
+    <string name="groupCardCount">&lt;xliff:g xmlns:xliff=\"urn:oasis:names:tc:xliff:document:1.2\"&gt;%d&lt;/xliff:g&gt; cartes</string>
+    <string name="noGroups">Vous n\'avez aucun groupe pour le moment. Cliquez sur le bouton + (plus) pour commencer.
+\n
+\nLes cartes peuvent être attribuées à des groupes pour les rendre plus faciles à trouver.</string>
+    <string name="groups">Groupes</string>
+    <string name="enter_group_name">Entrez le nom du groupe</string>
+</resources>

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

@@ -89,4 +89,15 @@
     <string name="exportOptionExplanation">I dati verranno scritti in una posizione a tua scelta.</string>
     <string name="addedShortcut">Scorciatoia aggiunta</string>
     <string name="barcodeType">Tipo di codice a barre</string>
-</resources>
+    <string name="unstar">Rimuovi dai preferiti</string>
+    <string name="star">Aggiungi ai preferiti</string>
+    <string name="starImage">Stella preferita</string>
+    <string name="deleteConfirmationGroup">Conferma di voler eliminare questo gruppo</string>
+    <string name="all">Tutti</string>
+    <string name="groupCardCount">&lt;xliff:g xmlns:xliff=\"urn:oasis:names:tc:xliff:document:1.2\"&gt;%d&lt;/xliff:g&gt; carte</string>
+    <string name="noGroups">Al momento non hai gruppi. Fai clic sul pulsante + (più) per iniziare.
+\n
+\nLe carte possono essere assegnate a gruppi per renderle più facili da trovare.</string>
+    <string name="groups">Gruppi</string>
+    <string name="enter_group_name">Inserisci il nome del gruppo</string>
+</resources>

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

@@ -48,7 +48,7 @@
     <string name="importOptionFilesystemTitle">Importer fra filsystem</string>
     <string name="importOptionFilesystemExplanation">Velg spesifikk fil fra filsystemet.</string>
     <string name="importOptionFilesystemButton">Fra filsystem</string>
-    <string name="importOptionApplicationTitle">Brukt eksternt program</string>
+    <string name="importOptionApplicationTitle">Bruk eksternt program</string>
     <string name="importOptionApplicationExplanation">Bruk eksternt program som Nextcloud, eller din favorittfilbehandler til å åpne ei fil.</string>
     <string name="importOptionApplicationButton">Bruk eksternt program</string>
     <string name="about">Om</string>
@@ -58,12 +58,8 @@
     <string name="debug_version_fmt">Versjon: <xliff:g id="version">%s</xliff:g>
     </string>
     <string name="app_revision_fmt">Utgivelsesinfo: <xliff:g id="app_revision_url">%s</xliff:g></string>
-    <string name="app_libraries">
-        <xliff:g id="app_name">%s</xliff:g> brukfer følgende tredjepartsbibliotek: <xliff:g id="app_libraries_list">%s</xliff:g>
-    </string>
-    <string name="app_resources">
-        <xliff:g id="app_name">%s</xliff:g> bruker følgende tredjepartsressurser: <xliff:g id="app_resources_list">%s</xliff:g>
-    </string>
+    <string name="app_libraries"><xliff:g id="app_name">%s</xliff:g> brukfer følgende tredjepartsbibliotek: <xliff:g id="app_libraries_list">%s</xliff:g></string>
+    <string name="app_resources"><xliff:g id="app_name">%s</xliff:g> bruker følgende tredjepartsressurser: <xliff:g id="app_resources_list">%s</xliff:g></string>
     <string name="selectBarcodeTitle">Velg strekkode</string>
     <string name="enterBarcodeInstructions">Skriv inn strekkodeverdien og velg så bildet som representerer strekkoden du ønsker å bruke.</string>
     <string name="copy_to_clipboard_toast">Kort-ID kopiert til utklippstavle</string>
@@ -89,10 +85,21 @@
     <string name="settings_light_theme">Lys</string>
     <string name="settings_system_theme">Systemdrakt</string>
     <string name="settings_theme">Drakt</string>
-    <string name="app_copyright_old">Basert på Kundekortknippe, opphavsrett 2016-2020 Branden Archer.</string>
+    <string name="app_copyright_old">Basert på Kundekortknippe, opphavsrett 2016–2020 Branden Archer.</string>
     <string name="failedParsingImportUriError">Kunne ikke tolke importerings-URI</string>
     <string name="share">Del</string>
     <string name="barcodeNoBarcode">Dette kortet har ingen strekkode</string>
     <string name="noMatchingGiftCards">Fant ingen slike kort. Prøv å endre søket.</string>
     <string name="action_search">Søk</string>
+    <string name="starImage">Favorittstjerne</string>
+    <string name="unstar">Fjern fra favoritter</string>
+    <string name="star">Legg til i favoritter</string>
+    <string name="groupCardCount">&lt;xliff:g xmlns:xliff=\"urn:oasis:names:tc:xliff:document:1.2\"&gt;%d&lt;/xliff:g&gt; kort</string>
+    <string name="noGroups">Du har ikke noen grupper for øyeblikket. Klikk «+»-tegnet for å begynne.
+\n
+\nKort kan tildeles grupper for å gjøre dem enklere å finne.</string>
+    <string name="deleteConfirmationGroup">Bekreft at du ønsker å slette denne gruppen</string>
+    <string name="all">Alle</string>
+    <string name="groups">Grupper</string>
+    <string name="enter_group_name">Skriv inn gruppenavn</string>
 </resources>

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

@@ -1,18 +1,14 @@
-<resources
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="action_search">Zoeken</string>
     <string name="action_add">Toevoegen</string>
-
     <string name="noGiftCards">Je hebt nog geen klantenkaarten toegevoegd. Druk op de knop \'+\' (plus) om te beginnen.\n\nMet Klantenkaartkluis beheer je je klantenkaarten op je smartphone of tablet zodat ze altijd binnen handbereik zijn.</string>
-    <string name="noMatchingGiftCards">Er zijn geen kaarten die overeenkomen met je zoekopdracht. Probeer het opnieuw.</string>
-
+    <string name="noMatchingGiftCards">Geen kaarten komen overeen met het filter. Probeer alsjeblieft wat andere termen.</string>
     <string name="storeName">Winkel</string>
     <string name="note">Aantekening</string>
     <string name="cardId">Kaartnummer</string>
     <string name="barcodeType">Soort barcode</string>
     <string name="barcodeNoBarcode">Deze kaart heeft geen barcode</string>
-
     <string name="cancel">Annuleren</string>
     <string name="save">Opslaan</string>
     <string name="capture">Scan een kaart</string>
@@ -28,16 +24,14 @@
     <string name="ok">Oké</string>
     <string name="copy_to_clipboard">Kaartnummer kopiëren naar klembord</string>
     <string name="share">Delen</string>
-    <string name="sendLabel">Versturen&#8230;</string>
+    <string name="sendLabel">Versturen…</string>
     <string name="addedShortcut">Snelkoppeling is toegevoegd</string>
     <string name="editCardTitle">Klantenkaart bewerken</string>
     <string name="addCardTitle">Klantenkaart toevoegen</string>
     <string name="scanCardBarcode">Scan de barcode van de kaart</string>
     <string name="cardShortcut">Kaartsnelkoppeling</string>
     <string name="noCardsMessage">Je hebt nog geen kaarten toegevoegd.</string>
-
     <string name="barcodeImageDescription">Afbeelding van barcode</string>
-
     <string name="noStoreError">Geen winkelnaam ingevoerd</string>
     <string name="noCardIdError">Geen kaartnummer ingevoerd</string>
     <string name="noCardExistsError">De klantenkaart kan niet worden opgevraagd</string>
@@ -52,17 +46,16 @@
     <string name="exportSuccessfulTitle">Exporteren voltooid</string>
     <string name="exportFailedTitle">Exporteren mislukt</string>
     <string name="exportFailed">Het exporteren is mislukt</string>
-    <string name="importing">Bezig met importeren&#8230;...</string>
-    <string name="exporting">Bezig met exporteren&#8230;...</string>
+    <string name="importing">Bezig met importeren…...</string>
+    <string name="exporting">Bezig met exporteren…...</string>
     <string name="noExternalStoragePermissionError">Het importeren of exporteren van kaarten is niet mogelijk zonder de machtiging \'externe opslag\'.</string>
     <string name="exportOptionExplanation">De gegevens worden weggeschreven op een locatie naar keuze.</string>
     <string name="importOptionFilesystemTitle">Importeren uit bestandssysteem</string>
     <string name="importOptionFilesystemExplanation">Kies een specifiek bestand uit het bestandssysteem.</string>
     <string name="importOptionFilesystemButton">Uit bestandssysteem</string>
-    <string name="importOptionApplicationTitle">Externe app gebruiken</string>
+    <string name="importOptionApplicationTitle">Externe toepassing gebruiken</string>
     <string name="importOptionApplicationExplanation">Open een bestand middels een externe app, zoals Dropbox, Google Drive of je favoriete bestandsbeheerder.</string>
     <string name="importOptionApplicationButton">Externe app gebruiken</string>
-
     <string name="about">Over</string>
     <string name="app_license">Uitgebracht onder de GPLv3-licentie.</string>
     <string name="about_title_fmt">Over <xliff:g id="app_name">%s</xliff:g></string>
@@ -70,20 +63,15 @@
     <string name="app_revision_fmt">Versie-informatie: <xliff:g id="app_revision_url">%s</xliff:g></string>
     <string name="app_libraries"><xliff:g id="app_name">%s</xliff:g> gebruikt de volgende bibliotheken van externe partijen: <xliff:g id="app_libraries_list">%s</xliff:g></string>
     <string name="app_resources"><xliff:g id="app_name">%s</xliff:g> gebruikt de volgende bronnen van externe partijen: <xliff:g id="app_resources_list">%s</xliff:g></string>
-
     <string name="selectBarcodeTitle">Barcode toevoegen</string>
-    <string name="enterBarcodeInstructions">Voer de barcode in en kies daarna de afbeelding van de barcode die je wilt gebruiken., of druk op &#8220;Deze kaart heeft geen barcode&#8221; om geen barcode te gebruiken.</string>
-
+    <string name="enterBarcodeInstructions">Voer de barcode in en kies daarna de afbeelding van de barcode die je wilt gebruiken., of druk op “Deze kaart heeft geen barcode” om geen barcode te gebruiken.</string>
     <string name="copy_to_clipboard_toast">Kaartnummer is gekopieerd naar het klembord</string>
-
     <string name="thumbnailDescription">Miniatuurvoorbeeld van kaart</string>
-
     <string name="change">Aanpassen</string>
     <string name="storeTextColorTitle">Tekstkleur van winkelnaam</string>
     <string name="storeTextBackgroundColorTitle">Kopkleur</string>
     <string name="storeNameBackgroundColorDescription">Achtergrondkleur van winkeltekst</string>
     <string name="storeNameColorDescription">Kleur van winkeltekst</string>
-
     <string name="settings">Instellingen</string>
     <string name="settings_category_title_ui">Uiterlijk en bediening</string>
     <string name="settings_theme">Thema</string>
@@ -98,4 +86,18 @@
     <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>
-    </resources>
+    <string name="all">Alles</string>
+    <string name="importSuccessful">De import van klantenkaartgegevens was succesvol</string>
+    <string name="deleteConfirmationGroup">Bevestig dat u deze groep wilt verwijderen</string>
+    <string name="groupCardCount">&lt;xliff:g xmlns:xliff=\"urn:oasis:names:tc:xliff:document:1.2\"&gt;%d&lt;/xliff:g&gt; kaart</string>
+    <string name="noGroups">Je hebt geen groepen op dit moment. Klik op de + (plus) knop om te beginnen.
+\n
+\nKaarten kunnen worden toegewezen aan groepen om ze gemakkelijker te vinden.</string>
+    <string name="exportSuccessful">De export van klantenkaartgegevens was succesvol</string>
+    <string name="groups">Groep</string>
+    <string name="enter_group_name">Voer groepsnaam in</string>
+    <string name="starImage">Favoriete ster</string>
+    <string name="app_copyright_old">Gebaseerd op Loyalty Card Keychain, copyright 2016-2020 Branden Archer.</string>
+    <string name="unstar">Verwijder uit favorieten</string>
+    <string name="star">Toevoegen aan favorieten</string>
+</resources>

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

@@ -1,18 +1,14 @@
-<resources
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="action_search">Поиск</string>
     <string name="action_add">Добавить карту</string>
-
     <string name="noGiftCards">Пока нет ни одной карты. Нажмите на кнопку «+» (плюс) сверху для добавления.\n\n«Карты лояльности» позволяют хранить карты скидок в телефоне, так что они всегда будут под рукой.</string>
     <string name="noMatchingGiftCards">Карт не найдено, попробуйте поискать по-другому.</string>
-
     <string name="storeName">Магазин</string>
     <string name="note">Примечание</string>
     <string name="cardId">Номер карты</string>
     <string name="barcodeType">Тип штрихкода</string>
     <string name="barcodeNoBarcode">Эта карта без штрихкода</string>
-
     <string name="cancel">Отменить</string>
     <string name="save">Сохранить</string>
     <string name="capture">Сканировать карту</string>
@@ -28,16 +24,14 @@
     <string name="ok">ОК</string>
     <string name="copy_to_clipboard">Скопировать номер карты в буфер обмена</string>
     <string name="share">Переслать</string>
-    <string name="sendLabel">Отправить&#8230;</string>
+    <string name="sendLabel">Отправить…</string>
     <string name="addedShortcut">Добавленный ярлык</string>
     <string name="editCardTitle">Редактировать карту</string>
     <string name="addCardTitle">Добавить карту</string>
     <string name="scanCardBarcode">Отсканируйте штрих-код</string>
     <string name="cardShortcut">Ярлык карты</string>
     <string name="noCardsMessage">Карт нет, добавьте одну для начала</string>
-
     <string name="barcodeImageDescription">Изображение штрих-кода</string>
-
     <string name="noStoreError">Название магазина не указано</string>
     <string name="noCardIdError">Номер карты не указан</string>
     <string name="noCardExistsError">Карта не найдена</string>
@@ -52,8 +46,8 @@
     <string name="exportSuccessfulTitle">Успешный экспорт</string>
     <string name="exportFailedTitle">Экспорт не удался</string>
     <string name="exportFailed">Не удалось экспортировать</string>
-    <string name="importing">Импорт&#8230;</string>
-    <string name="exporting">Экспорт&#8230;</string>
+    <string name="importing">Импорт…</string>
+    <string name="exporting">Экспорт…</string>
     <string name="noExternalStoragePermissionError">Импорт или экспорт невозможен без разрешения на доступ к хранилищу</string>
     <string name="exportOptionExplanation">Данные будут записаны в выбранное место.</string>
     <string name="importOptionFilesystemTitle">Импорт из файловой системы</string>
@@ -62,7 +56,6 @@
     <string name="importOptionApplicationTitle">Использование другого приложения</string>
     <string name="importOptionApplicationExplanation">Использовать другое приложение такое как Dropbox, Google Drive, или ваш любимый файловый менеджер чтобы открыть файл.</string>
     <string name="importOptionApplicationButton">Использовать другое приложение</string>
-
     <string name="about">О программе</string>
     <string name="app_license">Лицензия GPLv3.</string>
     <string name="about_title_fmt">О программе <xliff:g id="app_name">%s</xliff:g></string>
@@ -70,20 +63,15 @@
     <string name="app_revision_fmt">Информация о версиях: <xliff:g id="app_revision_url">%s</xliff:g></string>
     <string name="app_libraries"><xliff:g id="app_name">%s</xliff:g> использует следующие сторонние библиотеки: <xliff:g id="app_libraries_list">%s</xliff:g></string>
     <string name="app_resources"><xliff:g id="app_name">%s</xliff:g> использует следующие сторонние ресурсы: <xliff:g id="app_resources_list">%s</xliff:g></string>
-
     <string name="selectBarcodeTitle">Выбор штрих-кода</string>
     <string name="enterBarcodeInstructions">Введите ID карты и выберите тип штрих-кода.</string>
-
     <string name="copy_to_clipboard_toast">Номер карты скопирован в буфер обмена</string>
-
     <string name="thumbnailDescription">Логотип карты</string>
-
     <string name="change">Изменить</string>
     <string name="storeTextColorTitle">Цвет текста</string>
     <string name="storeTextBackgroundColorTitle">Цвет фона</string>
     <string name="storeNameBackgroundColorDescription">Цвет фона названия магазина</string>
     <string name="storeNameColorDescription">Цвет текста названия магазина</string>
-
     <string name="settings">Настройки</string>
     <string name="settings_category_title_ui">Внешний вид</string>
     <string name="settings_theme">Тема</string>
@@ -98,4 +86,5 @@
     <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>
-    </resources>
+    <string name="exportSuccessful">Данные карты лояльности успешно экспортированы</string>
+</resources>

app/src/main/res/values-v21/styles.xml

@@ -1,6 +1,6 @@
 <resources>>
 
-    <style name="AppTheme.NoActionBar">
+    <style name="AppTheme.NoActionBar" parent="AppTheme">
         <item name="windowActionBar">false</item>
         <item name="windowNoTitle">true</item>
         <item name="android:windowDrawsSystemBarBackgrounds">true</item>

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

@@ -21,7 +21,8 @@
 
     <dimen name="inputBorderThickness">2dip</dimen>
     <dimen name="inputBorderDividerThickness">4dip</dimen>
-    <dimen name="inputPadding">20dip</dimen>
+    <dimen name="inputMargin">2dip</dimen>
+    <dimen name="inputPadding">10dip</dimen>
     <dimen name="colorSamplePadding">10dip</dimen>
     <dimen name="inputSize">18sp</dimen>
 

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

@@ -5,14 +5,15 @@
     <string name="action_search">Search</string>
     <string name="action_add">Add</string>
 
-    <string name="noGiftCards">You don\'t have any cards at the moment. Click the "+" (plus) button to get started.\n\nCatima lets you carry your cards on your phone, so they are always within reach.</string>
-    <string name="noMatchingGiftCards">No cards match the search filter. Please try some different terms.</string>
+    <string name="noGiftCards">Click the "+" (plus) button to add a card first.\n\nCatima carries your cards on the device, so they are always within reach.</string>
+    <string name="noMatchingGiftCards">Didn\'t find anything. Try changing your search.</string>
 
     <string name="storeName">Store</string>
     <string name="note">Note</string>
     <string name="cardId">Card ID</string>
     <string name="barcodeType">Barcode type</string>
     <string name="barcodeNoBarcode">This card has no barcode</string>
+    <string name="noBarcode">No barcode</string>
 
     <string name="star">Add to favorites</string>
     <string name="unstar">Remove from favorites</string>
@@ -28,7 +29,7 @@
     <string name="lockScreen">Block Rotation</string>
     <string name="unlockScreen">Unblock Rotation</string>
     <string name="deleteTitle">Remove Card</string>
-    <string name="deleteConfirmation">Please confirm that you want to delete this card.</string>
+    <string name="deleteConfirmation">Please confirm you want to delete this card.</string>
     <string name="ok">OK</string>
     <string name="copy_to_clipboard">Copy ID to clipboard</string>
     <string name="share">Share</string>
@@ -36,44 +37,44 @@
     <string name="addedShortcut">Added shortcut</string>
     <string name="editCardTitle">Edit Card</string>
     <string name="addCardTitle">Add Card</string>
-    <string name="scanCardBarcode">Scan Card\'s Barcode</string>
+    <string name="scanCardBarcode">Scan Card Barcode</string>
     <string name="cardShortcut">Card Shortcut</string>
-    <string name="noCardsMessage">There are no cards, add one first</string>
+    <string name="noCardsMessage">Add a card first</string>
 
-    <string name="barcodeImageDescription">Image of card\'s barcode</string>
+    <string name="barcodeImageDescription">Image of card barcode</string>
 
-    <string name="noStoreError">No Store entered</string>
-    <string name="noCardIdError">No Card ID entered</string>
-    <string name="noCardExistsError">Could not lookup loyalty card</string>
+    <string name="noStoreError">No store entered</string>
+    <string name="noCardIdError">No card ID entered</string>
+    <string name="noCardExistsError">Could not find card</string>
     <string name="failedParsingImportUriError">Could not parse the import URI</string>
     <string name="cardIdFormat">%1$s: %2$s</string>
     <string name="importExport">Import/Export</string>
     <string name="exportName">Export</string>
-    <string name="importExportHelp">Backed up data can allow you to move your cards to another device.</string>
-    <string name="importSuccessfulTitle">Import successful</string>
+    <string name="importExportHelp">Backing up your cards allows you to move them to another device.</string>
+    <string name="importSuccessfulTitle">Imported</string>
     <string name="importFailedTitle">Import failed</string>
-    <string name="importFailed">Failed to import</string>
-    <string name="exportSuccessfulTitle">Export successful</string>
+    <string name="importFailed">Could not import cards</string>
+    <string name="exportSuccessfulTitle">Exported</string>
     <string name="exportFailedTitle">Export failed</string>
-    <string name="exportFailed">Failed to export</string>
+    <string name="exportFailed">Could not export cards</string>
     <string name="importing">Importing&#8230;</string>
     <string name="exporting">Exporting&#8230;</string>
-    <string name="noExternalStoragePermissionError">Unable to import or export cards without the external storage permission</string>
-    <string name="exportOptionExplanation">Data will be written to a location of your choice.</string>
+    <string name="noExternalStoragePermissionError">Grant external storage permission to import or export cards first</string>
+    <string name="exportOptionExplanation">The data will be written to a location of your choice.</string>
     <string name="importOptionFilesystemTitle">Import from filesystem</string>
     <string name="importOptionFilesystemExplanation">Choose a specific file from the filesystem.</string>
     <string name="importOptionFilesystemButton">From filesystem</string>
-    <string name="importOptionApplicationTitle">Use external ap1plication</string>
-    <string name="importOptionApplicationExplanation">Use an external application like Dropbox, Google Drive, or your favorite file manager to open a file.</string>
-    <string name="importOptionApplicationButton">Use external application</string>
+    <string name="importOptionApplicationTitle">Use external app</string>
+    <string name="importOptionApplicationExplanation">Use any app or your favorite file manager to open a file.</string>
+    <string name="importOptionApplicationButton">Use external app</string>
 
     <string name="about">About</string>
-    <string name="app_copyright_fmt" translatable="false">Copyright 2019-<xliff:g>%d</xliff:g> Sylvia van Os.</string>
-    <string name="app_copyright_old">Based on Loyalty Card Keychain, copyright 2016-2020 Branden Archer.</string>
-    <string name="app_license">Licensed under the GPLv3.</string>
+    <string name="app_copyright_fmt" translatable="false">Copyright 2019–<xliff:g>%d</xliff:g> Sylvia van Os.</string>
+    <string name="app_copyright_old">Based on Loyalty Card Keychain, copyright 2016–2020 Branden Archer.</string>
+    <string name="app_license">Copylefted libre software, licensed GPLv3+.</string>
     <string name="about_title_fmt">About <xliff:g id="app_name">%s</xliff:g></string>
     <string name="debug_version_fmt">Version: <xliff:g id="version">%s</xliff:g></string>
-    <string name="app_revision_fmt">Revision Information: <xliff:g id="app_revision_url">%s</xliff:g></string>
+    <string name="app_revision_fmt">Revision Info: <xliff:g id="app_revision_url">%s</xliff:g></string>
     <string name="app_libraries"><xliff:g id="app_name">%s</xliff:g> uses the following third-party libraries: <xliff:g id="app_libraries_list">%s</xliff:g></string>
     <string name="app_resources"><xliff:g id="app_name">%s</xliff:g> uses the following third-party resources: <xliff:g id="app_resources_list">%s</xliff:g></string>
 
@@ -95,15 +96,15 @@
     <string name="settings_category_title_ui">User interface</string>
     <string name="settings_theme">Theme</string>
     <string name="settings_key_theme" translatable="false">pref_theme</string>
-    <string name="settings_system_theme">System theme</string>
+    <string name="settings_system_theme">System</string>
     <string name="settings_key_system_theme" translatable="false">system</string>
-    <string name="settings_light_theme">Light theme</string>
+    <string name="settings_light_theme">Light</string>
     <string name="settings_key_light_theme" translatable="false">light</string>
-    <string name="settings_dark_theme">Dark theme</string>
+    <string name="settings_dark_theme">Dark</string>
     <string name="settings_key_dark_theme" translatable="false">dark</string>
-    <string name="settings_card_title_list_font_size">Card title list font size</string>
+    <string name="settings_card_title_list_font_size">Font size for card titles</string>
     <string name="settings_key_card_title_list_font_size" translatable="false">pref_card_title_list_font_size_sp</string>
-    <string name="settings_card_note_list_font_size">Card note list font size</string>
+    <string name="settings_card_note_list_font_size">Font size for card note list </string>
     <string name="settings_key_card_note_list_font_size" translatable="false">pref_card_note_list_font_size_sp</string>
     <string name="settings_card_title_font_size">Card title font size</string>
     <string name="settings_key_card_title_font_size" translatable="false">pref_card_title_font_size_sp</string>
@@ -121,6 +122,13 @@
     <string name="intent_import_card_from_url_path_prefix" translatable="false">/Catima/share</string>
     <string name="intent_import_card_from_url_host_old" translatable="false">brarcher.github.io</string>
     <string name="intent_import_card_from_url_path_prefix_old" translatable="false">/loyalty-card-locker/share</string>
-    <string name="importSuccessful">Successfully imported loyalty card data</string>
-    <string name="exportSuccessful">Successfully exported loyalty card data</string>
+    <string name="importSuccessful">Card data imported</string>
+    <string name="exportSuccessful">Card data exported</string>
+
+    <string name="enter_group_name">Enter group name</string>
+    <string name="groups">Groups</string>
+    <string name="noGroups">Click the "+" (plus) button to add groups first.\n\nGroups make things easier to find.</string>
+    <string name="groupCardCount"><xliff:g>%d</xliff:g> cards</string>
+    <string name="all">All</string>
+    <string name="deleteConfirmationGroup">Please confirm you want to delete this group</string>
 </resources>

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

@@ -1,23 +1,24 @@
 <resources>
 
     <!-- Base application theme. -->
-    <style name="AppTheme" parent="Theme.AppCompat.DayNight.DarkActionBar">
+    <style name="AppTheme" parent="Theme.MaterialComponents.DayNight.DarkActionBar">
         <!-- Customize your theme here. -->
         <item name="colorPrimary">@color/colorPrimary</item>
         <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
+        <item name="colorSecondary">@color/colorSecondary</item>
         <item name="colorAccent">@color/colorSecondary</item>
     </style>
 
-    <style name="AppTheme.NoActionBar">
+    <style name="AppTheme.NoActionBar" parent="AppTheme">
         <item name="windowActionBar">false</item>
         <item name="windowNoTitle">true</item>
     </style>
 
-    <style name="AppTheme.AppBarOverlay" parent="ThemeOverlay.AppCompat.Dark.ActionBar"/>
+    <style name="AppTheme.AppBarOverlay" parent="ThemeOverlay.MaterialComponents.Dark.ActionBar"/>
 
-    <style name="AppTheme.PopupOverlay" parent="ThemeOverlay.AppCompat.Light"/>
+    <style name="AppTheme.PopupOverlay" parent="ThemeOverlay.MaterialComponents.Light"/>
 
-    <style name="CardView.ActionBarTheme" parent="@style/ThemeOverlay.AppCompat.ActionBar">
+    <style name="CardView.ActionBarTheme" parent="@style/ThemeOverlay.MaterialComponents.ActionBar">
         <!-- THIS is where you can color the arrow! -->
         <item name="colorControlNormal">@android:color/white</item>
     </style>

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

@@ -15,7 +15,11 @@ import org.robolectric.Robolectric;
 import org.robolectric.RobolectricTestRunner;
 import org.robolectric.annotation.Config;
 
+import java.util.ArrayList;
+import java.util.List;
+
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
@@ -40,7 +44,7 @@ public class DatabaseTest
     public void addRemoveOneGiftCard()
     {
         assertEquals(0, db.getLoyaltyCardCount());
-        long id = db.insertLoyaltyCard("store", "note", "cardId", BarcodeFormat.UPC_A.toString(), DEFAULT_HEADER_COLOR, DEFAULT_HEADER_TEXT_COLOR, 0);
+        long id = db.insertLoyaltyCard("store", "note", "cardId", BarcodeFormat.UPC_A.toString(), DEFAULT_HEADER_COLOR, 0);
         boolean result = (id != -1);
         assertTrue(result);
         assertEquals(1, db.getLoyaltyCardCount());
@@ -62,12 +66,12 @@ public class DatabaseTest
     @Test
     public void updateGiftCard()
     {
-        long id = db.insertLoyaltyCard("store", "note", "cardId", BarcodeFormat.UPC_A.toString(), DEFAULT_HEADER_COLOR, DEFAULT_HEADER_TEXT_COLOR,0);
+        long id = db.insertLoyaltyCard("store", "note", "cardId", BarcodeFormat.UPC_A.toString(), DEFAULT_HEADER_COLOR, 0);
         boolean result = (id != -1);
         assertTrue(result);
         assertEquals(1, db.getLoyaltyCardCount());
 
-        result = db.updateLoyaltyCard(1, "store1", "note1", "cardId1", BarcodeFormat.AZTEC.toString(), DEFAULT_HEADER_COLOR, DEFAULT_HEADER_TEXT_COLOR);
+        result = db.updateLoyaltyCard(1, "store1", "note1", "cardId1", BarcodeFormat.AZTEC.toString(), DEFAULT_HEADER_COLOR);
         assertTrue(result);
         assertEquals(1, db.getLoyaltyCardCount());
 
@@ -83,7 +87,7 @@ public class DatabaseTest
     @Test
     public void updateGiftCardOnlyStar()
     {
-        long id = db.insertLoyaltyCard("store", "note", "cardId", BarcodeFormat.UPC_A.toString(), DEFAULT_HEADER_COLOR, DEFAULT_HEADER_TEXT_COLOR,0);
+        long id = db.insertLoyaltyCard("store", "note", "cardId", BarcodeFormat.UPC_A.toString(), DEFAULT_HEADER_COLOR, 0);
         boolean result = (id != -1);
         assertTrue(result);
         assertEquals(1, db.getLoyaltyCardCount());
@@ -101,15 +105,13 @@ public class DatabaseTest
         assertEquals(BarcodeFormat.UPC_A.toString(), loyaltyCard.barcodeType);
     }
 
-
-
     @Test
     public void updateMissingGiftCard()
     {
         assertEquals(0, db.getLoyaltyCardCount());
 
         boolean result = db.updateLoyaltyCard(1, "store1", "note1", "cardId1",
-                BarcodeFormat.UPC_A.toString(), DEFAULT_HEADER_COLOR, DEFAULT_HEADER_TEXT_COLOR);
+                BarcodeFormat.UPC_A.toString(), DEFAULT_HEADER_COLOR);
         assertEquals(false, result);
         assertEquals(0, db.getLoyaltyCardCount());
     }
@@ -117,7 +119,7 @@ public class DatabaseTest
     @Test
     public void emptyGiftCardValues()
     {
-        long id = db.insertLoyaltyCard("", "", "", "", null, null, 0);
+        long id = db.insertLoyaltyCard("", "", "", "", null, 0);
         boolean result = (id != -1);
         assertTrue(result);
         assertEquals(1, db.getLoyaltyCardCount());
@@ -140,7 +142,7 @@ public class DatabaseTest
         for(int index = CARDS_TO_ADD-1; index >= 0; index--)
         {
             long id = db.insertLoyaltyCard("store" + index, "note" + index, "cardId" + index,
-                    BarcodeFormat.UPC_A.toString(), index, index*2, 0);
+                    BarcodeFormat.UPC_A.toString(), index, 0);
             boolean result = (id != -1);
             assertTrue(result);
         }
@@ -163,7 +165,6 @@ public class DatabaseTest
             assertEquals(BarcodeFormat.UPC_A.toString(), cursor.getString(cursor.getColumnIndexOrThrow(DBHelper.LoyaltyCardDbIds.BARCODE_TYPE)));
             assertEquals(0, cursor.getInt(cursor.getColumnIndexOrThrow(DBHelper.LoyaltyCardDbIds.STAR_STATUS)));
             assertEquals(index, cursor.getInt(cursor.getColumnIndexOrThrow(DBHelper.LoyaltyCardDbIds.HEADER_COLOR)));
-            assertEquals(index*2, cursor.getInt(cursor.getColumnIndexOrThrow(DBHelper.LoyaltyCardDbIds.HEADER_TEXT_COLOR)));
 
             cursor.moveToNext();
         }
@@ -182,12 +183,12 @@ public class DatabaseTest
         {
             if (index == CARDS_TO_ADD-1) {
                 id = db.insertLoyaltyCard("store" + index, "note" + index, "cardId" + index,
-                        BarcodeFormat.UPC_A.toString(), index, index*2, 1);
+                        BarcodeFormat.UPC_A.toString(), index, 1);
             }
 
             else {
                 id = db.insertLoyaltyCard("store" + index, "note" + index, "cardId" + index,
-                        BarcodeFormat.UPC_A.toString(), index, index*2, 0);
+                        BarcodeFormat.UPC_A.toString(), index, 0);
             }
             boolean result = (id != -1);
             assertTrue(result);
@@ -209,7 +210,6 @@ public class DatabaseTest
         assertEquals(BarcodeFormat.UPC_A.toString(), cursor.getString(cursor.getColumnIndexOrThrow(DBHelper.LoyaltyCardDbIds.BARCODE_TYPE)));
         assertEquals(1, cursor.getInt(cursor.getColumnIndexOrThrow(DBHelper.LoyaltyCardDbIds.STAR_STATUS)));
         assertEquals(index, cursor.getInt(cursor.getColumnIndexOrThrow(DBHelper.LoyaltyCardDbIds.HEADER_COLOR)));
-        assertEquals(index*2, cursor.getInt(cursor.getColumnIndexOrThrow(DBHelper.LoyaltyCardDbIds.HEADER_TEXT_COLOR)));
 
         cursor.moveToNext();
 
@@ -222,7 +222,6 @@ public class DatabaseTest
             assertEquals(BarcodeFormat.UPC_A.toString(), cursor.getString(cursor.getColumnIndexOrThrow(DBHelper.LoyaltyCardDbIds.BARCODE_TYPE)));
             assertEquals(0, cursor.getInt(cursor.getColumnIndexOrThrow(DBHelper.LoyaltyCardDbIds.STAR_STATUS)));
             assertEquals(index, cursor.getInt(cursor.getColumnIndexOrThrow(DBHelper.LoyaltyCardDbIds.HEADER_COLOR)));
-            assertEquals(index*2, cursor.getInt(cursor.getColumnIndexOrThrow(DBHelper.LoyaltyCardDbIds.HEADER_TEXT_COLOR)));
 
             cursor.moveToNext();
         }
@@ -234,6 +233,8 @@ public class DatabaseTest
     {
         // Delete the tables as they exist now
         database.execSQL("drop table " + DBHelper.LoyaltyCardDbIds.TABLE);
+        database.execSQL("drop table " + DBHelper.LoyaltyCardDbGroups.TABLE);
+        database.execSQL("drop table " + DBHelper.LoyaltyCardDbIdsGroups.TABLE);
 
         // Create the table as it existed in revision 1
         database.execSQL("create table " + DBHelper.LoyaltyCardDbIds.TABLE + "(" +
@@ -256,6 +257,161 @@ public class DatabaseTest
         return (int)newId;
     }
 
+    @Test
+    public void addRemoveOneGroup()
+    {
+        assertEquals(0, db.getGroupCount());
+        long id = db.insertGroup("group one");
+        boolean result = (id != -1);
+        assertTrue(result);
+        assertEquals(1, db.getGroupCount());
+
+        Group group = db.getGroup("group one");
+        assertNotNull(group);
+        assertEquals("group one", group._id);
+
+        result = db.deleteGroup("group one");
+        assertTrue(result);
+        assertEquals(0, db.getGroupCount());
+        assertNull(db.getGroup("group one"));
+    }
+
+    @Test
+    public void updateGroup()
+    {
+        long id = db.insertGroup("group one");
+        boolean result = (id != -1);
+        assertTrue(result);
+        assertEquals(1, db.getGroupCount());
+
+        result = db.updateGroup("group one", "group one renamed");
+        assertTrue(result);
+        assertEquals(1, db.getGroupCount());
+
+        // Group one no longer exists
+        Group group = db.getGroup("group one");
+        assertNull(group);
+
+        // But group one renamed does
+        Group group2 = db.getGroup("group one renamed");
+        assertNotNull(group2);
+        assertEquals("group one renamed", group2._id);
+    }
+
+    @Test
+    public void updateMissingGroup()
+    {
+        assertEquals(0, db.getGroupCount());
+
+        boolean result = db.updateGroup("group one", "new name");
+        assertEquals(false, result);
+        assertEquals(0, db.getGroupCount());
+    }
+
+    @Test
+    public void emptyGroupValues()
+    {
+        long id = db.insertGroup("");
+        boolean result = (id != -1);
+        assertFalse(result);
+        assertEquals(0, db.getLoyaltyCardCount());
+    }
+
+    @Test
+    public void duplicateGroupName()
+    {
+        assertEquals(0, db.getGroupCount());
+        long id = db.insertGroup("group one");
+        boolean result = (id != -1);
+        assertTrue(result);
+        assertEquals(1, db.getGroupCount());
+
+        Group group = db.getGroup("group one");
+        assertNotNull(group);
+        assertEquals("group one", group._id);
+
+        // Should fail on duplicate
+        long id2 = db.insertGroup("group one");
+        boolean result2 = (id2 != -1);
+        assertFalse(result2);
+        assertEquals(1, db.getGroupCount());
+    }
+
+    @Test
+    public void updateGroupDuplicate()
+    {
+        long id = db.insertGroup("group one");
+        boolean result = (id != -1);
+        assertTrue(result);
+        assertEquals(1, db.getGroupCount());
+
+        long id2 = db.insertGroup("group two");
+        boolean result2 = (id2 != -1);
+        assertTrue(result2);
+        assertEquals(2, db.getGroupCount());
+
+        // Should fail when trying to rename group two to one
+        boolean result3 = db.updateGroup("group two", "group one");
+        assertFalse(result3);
+        assertEquals(2, db.getGroupCount());
+
+        // Rename failed so both should still be the same
+        Group group = db.getGroup("group one");
+        assertNotNull(group);
+        assertEquals("group one", group._id);
+
+        Group group2 = db.getGroup("group two");
+        assertNotNull(group2);
+        assertEquals("group two", group2._id);
+    }
+
+    @Test
+    public void cardAddAndRemoveGroups()
+    {
+        // Create card
+        assertEquals(0, db.getLoyaltyCardCount());
+        long id = db.insertLoyaltyCard("store", "note", "cardId", BarcodeFormat.UPC_A.toString(), DEFAULT_HEADER_COLOR, 0);
+        boolean result = (id != -1);
+        assertTrue(result);
+        assertEquals(1, db.getLoyaltyCardCount());
+
+        // Create two groups to only one card
+        assertEquals(0, db.getGroupCount());
+        long gid = db.insertGroup("one");
+        boolean gresult = (gid != -1);
+        assertTrue(gresult);
+
+        long gid2 = db.insertGroup("two");
+        boolean gresult2 = (gid2 != -1);
+        assertTrue(gresult2);
+
+        assertEquals(2, db.getGroupCount());
+
+        Group group1 = db.getGroup("one");
+
+        // Card has no groups by default
+        List<Group> cardGroups = db.getLoyaltyCardGroups(1);
+        assertEquals(0, cardGroups.size());
+
+        // Add one groups to card
+        List<Group> groupList1 = new ArrayList<>();
+        groupList1.add(group1);
+        db.setLoyaltyCardGroups(1, groupList1);
+
+        List<Group> cardGroups1 = db.getLoyaltyCardGroups(1);
+        assertEquals(1, cardGroups1.size());
+        assertEquals(cardGroups1.get(0)._id, group1._id);
+        assertEquals(1, db.getGroupCardCount("one"));
+        assertEquals(0, db.getGroupCardCount("two"));
+
+        // Remove groups
+        db.setLoyaltyCardGroups(1, new ArrayList<Group>());
+        List<Group> cardGroups2 = db.getLoyaltyCardGroups(1);
+        assertEquals(0, cardGroups2.size());
+        assertEquals(0, db.getGroupCardCount("one"));
+        assertEquals(0, db.getGroupCardCount("two"));
+    }
+
     @Test
     public void databaseUpgradeFromVersion1()
     {

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

@@ -9,7 +9,6 @@ import android.content.pm.ActivityInfo;
 import android.content.pm.ApplicationInfo;
 import android.content.pm.PackageManager;
 import android.content.pm.ResolveInfo;
-import android.net.Uri;
 import android.view.View;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -17,7 +16,6 @@ import org.robolectric.Robolectric;
 import org.robolectric.RobolectricTestRunner;
 import org.robolectric.RuntimeEnvironment;
 import org.robolectric.annotation.Config;
-import org.robolectric.shadows.ShadowPackageManager;
 
 @RunWith(RobolectricTestRunner.class)
 @Config(sdk = 23)

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

@@ -24,7 +24,9 @@ import java.io.IOException;
 import java.io.InputStreamReader;
 import java.io.OutputStreamWriter;
 import java.nio.charset.StandardCharsets;
+import java.util.ArrayList;
 import java.util.Calendar;
+import java.util.List;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
@@ -68,7 +70,7 @@ public class ImportExportTest
         {
             String storeName = String.format("store, \"%4d", index);
             String note = String.format("note, \"%4d", index);
-            long id = db.insertLoyaltyCard(storeName, note, BARCODE_DATA, BARCODE_TYPE, index, index*2, 0);
+            long id = db.insertLoyaltyCard(storeName, note, BARCODE_DATA, BARCODE_TYPE, index, 0);
             boolean result = (id != -1);
             assertTrue(result);
         }
@@ -84,7 +86,7 @@ public class ImportExportTest
         {
             String storeName = String.format("store, \"%4d", index);
             String note = String.format("note, \"%4d", index);
-            long id = db.insertLoyaltyCard(storeName, note, BARCODE_DATA, BARCODE_TYPE, index, index*2, 1);
+            long id = db.insertLoyaltyCard(storeName, note, BARCODE_DATA, BARCODE_TYPE, index, 1);
             boolean result = (id != -1);
             assertTrue(result);
         }
@@ -93,13 +95,27 @@ public class ImportExportTest
             String storeName = String.format("store, \"%4d", index);
             String note = String.format("note, \"%4d", index);
             //if index is even
-            long id = db.insertLoyaltyCard(storeName, note, BARCODE_DATA, BARCODE_TYPE, index, index*2, 0);
+            long id = db.insertLoyaltyCard(storeName, note, BARCODE_DATA, BARCODE_TYPE, index, 0);
             boolean result = (id != -1);
             assertTrue(result);
         }
         assertEquals(cardsToAdd, db.getLoyaltyCardCount());
     }
 
+    private void addGroups(int groupsToAdd)
+    {
+        // Add in reverse order to test sorting
+        for(int index = groupsToAdd; index > 0; index--)
+        {
+            String groupName = String.format("group, \"%4d", index);
+            long id = db.insertGroup(groupName);
+            boolean result = (id != -1);
+            assertTrue(result);
+        }
+
+        assertEquals(groupsToAdd, db.getGroupCount());
+    }
+
     /**
      * Check that all of the cards follow the pattern
      * specified in addLoyaltyCards(), and are in sequential order
@@ -122,7 +138,6 @@ public class ImportExportTest
             assertEquals(BARCODE_DATA, card.cardId);
             assertEquals(BARCODE_TYPE, card.barcodeType);
             assertEquals(Integer.valueOf(index), card.headerColor);
-            assertEquals(Integer.valueOf(index*2), card.headerTextColor);
             assertEquals(0, card.starStatus);
 
             index++;
@@ -153,7 +168,6 @@ public class ImportExportTest
             assertEquals(BARCODE_DATA, card.cardId);
             assertEquals(BARCODE_TYPE, card.barcodeType);
             assertEquals(Integer.valueOf(index), card.headerColor);
-            assertEquals(Integer.valueOf(index*2), card.headerTextColor);
             assertEquals(1, card.starStatus);
 
             index++;
@@ -172,7 +186,6 @@ public class ImportExportTest
         assertEquals(BARCODE_DATA, card.cardId);
         assertEquals(BARCODE_TYPE, card.barcodeType);
         assertEquals(Integer.valueOf(index), card.headerColor);
-        assertEquals(Integer.valueOf(index*2), card.headerTextColor);
         assertEquals(0, card.starStatus);
 
         index++;
@@ -181,6 +194,29 @@ public class ImportExportTest
         cursor.close();
     }
 
+    /**
+     * Check that all of the groups follow the pattern
+     * specified in addGroups(), and are in sequential order
+     * where the smallest group's index is 1
+     */
+    private void checkGroups()
+    {
+        Cursor cursor = db.getGroupCursor();
+        int index = 1;
+
+        while(cursor.moveToNext())
+        {
+            Group group = Group.toGroup(cursor);
+
+            String expectedGroupName = String.format("group, \"%4d", index);
+
+            assertEquals(expectedGroupName, group._id);
+
+            index++;
+        }
+        cursor.close();
+    }
+
     /**
      * Delete the contents of the database
      */
@@ -263,6 +299,96 @@ public class ImportExportTest
         }
     }
 
+    private List<String> groupsToGroupNames(List<Group> groups)
+    {
+        List<String> groupNames = new ArrayList<>();
+
+        for (Group group : groups) {
+            groupNames.add(group._id);
+        }
+
+        return groupNames;
+    }
+
+    @Test
+    public void multipleCardsExportImportWithGroups() throws IOException
+    {
+        final int NUM_CARDS = 10;
+        final int NUM_GROUPS = 3;
+
+        for(DataFormat format : DataFormat.values())
+        {
+            addLoyaltyCards(NUM_CARDS);
+            addGroups(NUM_GROUPS);
+
+            List<Group> emptyGroup = new ArrayList<>();
+
+            List<Group> groupsForOne = new ArrayList<>();
+            groupsForOne.add(db.getGroup("group, \"   1"));
+
+            List<Group> groupsForTwo = new ArrayList<>();
+            groupsForTwo.add(db.getGroup("group, \"   1"));
+            groupsForTwo.add(db.getGroup("group, \"   2"));
+
+            List<Group> groupsForThree = new ArrayList<>();
+            groupsForThree.add(db.getGroup("group, \"   1"));
+            groupsForThree.add(db.getGroup("group, \"   2"));
+            groupsForThree.add(db.getGroup("group, \"   3"));
+
+            List<Group> groupsForFour = new ArrayList<>();
+            groupsForFour.add(db.getGroup("group, \"   1"));
+            groupsForFour.add(db.getGroup("group, \"   2"));
+            groupsForFour.add(db.getGroup("group, \"   3"));
+
+            List<Group> groupsForFive = new ArrayList<>();
+            groupsForFive.add(db.getGroup("group, \"   1"));
+            groupsForFive.add(db.getGroup("group, \"   3"));
+
+            db.setLoyaltyCardGroups(1, groupsForOne);
+            db.setLoyaltyCardGroups(2, groupsForTwo);
+            db.setLoyaltyCardGroups(3, groupsForThree);
+            db.setLoyaltyCardGroups(4, groupsForFour);
+            db.setLoyaltyCardGroups(5, groupsForFive);
+
+            ByteArrayOutputStream outData = new ByteArrayOutputStream();
+            OutputStreamWriter outStream = new OutputStreamWriter(outData);
+
+            // Export data to CSV format
+            boolean result = MultiFormatExporter.exportData(db, outStream, format);
+            assertTrue(result);
+            outStream.close();
+
+            clearDatabase();
+
+            ByteArrayInputStream inData = new ByteArrayInputStream(outData.toByteArray());
+            InputStreamReader inStream = new InputStreamReader(inData);
+
+            // Import the CSV data
+            result = MultiFormatImporter.importData(db, inStream, DataFormat.CSV);
+            assertTrue(result);
+
+            assertEquals(NUM_CARDS, db.getLoyaltyCardCount());
+            assertEquals(NUM_GROUPS, db.getGroupCount());
+
+            checkLoyaltyCards();
+            checkGroups();
+
+            assertEquals(groupsToGroupNames(groupsForOne), groupsToGroupNames(db.getLoyaltyCardGroups(1)));
+            assertEquals(groupsToGroupNames(groupsForTwo), groupsToGroupNames(db.getLoyaltyCardGroups(2)));
+            assertEquals(groupsToGroupNames(groupsForThree), groupsToGroupNames(db.getLoyaltyCardGroups(3)));
+            assertEquals(groupsToGroupNames(groupsForFour), groupsToGroupNames(db.getLoyaltyCardGroups(4)));
+            assertEquals(groupsToGroupNames(groupsForFive), groupsToGroupNames(db.getLoyaltyCardGroups(5)));
+            assertEquals(emptyGroup, db.getLoyaltyCardGroups(6));
+            assertEquals(emptyGroup, db.getLoyaltyCardGroups(7));
+            assertEquals(emptyGroup, db.getLoyaltyCardGroups(8));
+            assertEquals(emptyGroup, db.getLoyaltyCardGroups(9));
+            assertEquals(emptyGroup, db.getLoyaltyCardGroups(10));
+
+            // Clear the database for the next format under test
+            clearDatabase();
+        }
+    }
+
     @Test
     public void importExistingCardsNotReplace() throws IOException
     {
@@ -395,7 +521,7 @@ public class ImportExportTest
     }
 
     @Test
-    public void importWithoutColors() throws IOException
+    public void importWithoutColorsV1() throws IOException
     {
         String csvText = "";
         csvText += DBHelper.LoyaltyCardDbIds.ID + "," +
@@ -423,11 +549,10 @@ public class ImportExportTest
         assertEquals("type", card.barcodeType);
         assertEquals(0, card.starStatus);
         assertNull(card.headerColor);
-        assertNull(card.headerTextColor);
     }
 
     @Test
-    public void importWithoutNullColors() throws IOException
+    public void importWithoutNullColorsV1() throws IOException
     {
         String csvText = "";
         csvText += DBHelper.LoyaltyCardDbIds.ID + "," +
@@ -457,11 +582,10 @@ public class ImportExportTest
         assertEquals("type", card.barcodeType);
         assertEquals(0, card.starStatus);
         assertNull(card.headerColor);
-        assertNull(card.headerTextColor);
     }
 
     @Test
-    public void importWithoutInvalidColors() throws IOException
+    public void importWithoutInvalidColorsV1() throws IOException
     {
         String csvText = "";
         csvText += DBHelper.LoyaltyCardDbIds.ID + "," +
@@ -485,7 +609,7 @@ public class ImportExportTest
     }
 
     @Test
-    public void importWithNoBarcodeType() throws IOException
+    public void importWithNoBarcodeTypeV1() throws IOException
     {
         String csvText = "";
         csvText += DBHelper.LoyaltyCardDbIds.ID + "," +
@@ -515,11 +639,10 @@ public class ImportExportTest
         assertEquals("", card.barcodeType);
         assertEquals(0, card.starStatus);
         assertEquals(1, (long) card.headerColor);
-        assertEquals(1, (long) card.headerTextColor);
     }
 
     @Test
-    public void importWithStarredField() throws IOException
+    public void importWithStarredFieldV1() throws IOException
     {
         String csvText = "";
         csvText += DBHelper.LoyaltyCardDbIds.ID + "," +
@@ -549,13 +672,12 @@ public class ImportExportTest
         assertEquals("type", card.barcodeType);
         assertEquals(1, card.starStatus);
         assertEquals(1, (long) card.headerColor);
-        assertEquals(1, (long) card.headerTextColor);
     }
 
 
 
     @Test
-    public void importWithNoStarredField() throws IOException
+    public void importWithNoStarredFieldV1() throws IOException
     {
         String csvText = "";
         csvText += DBHelper.LoyaltyCardDbIds.ID + "," +
@@ -585,11 +707,10 @@ public class ImportExportTest
         assertEquals("type", card.barcodeType);
         assertEquals(0, card.starStatus);
         assertEquals(1, (long) card.headerColor);
-        assertEquals(1, (long) card.headerTextColor);
     }
 
     @Test
-    public void importWithInvalidStarField() throws IOException
+    public void importWithInvalidStarFieldV1() throws IOException
     {
         String csvText = "";
         csvText += DBHelper.LoyaltyCardDbIds.ID + "," +
@@ -639,6 +760,5 @@ public class ImportExportTest
         assertEquals("type", card.barcodeType);
         assertEquals(0, card.starStatus);
         assertEquals(1, (long) card.headerColor);
-        assertEquals(1, (long) card.headerTextColor);
-        }
+    }
 }

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

@@ -35,7 +35,7 @@ public class ImportURITest {
     public void ensureNoDataLoss() throws InvalidObjectException
     {
         // Generate card
-        db.insertLoyaltyCard("store", "note", BarcodeFormat.UPC_A.toString(), LoyaltyCardDbIds.BARCODE_TYPE, Color.BLACK, Color.WHITE, 1);
+        db.insertLoyaltyCard("store", "note", BarcodeFormat.UPC_A.toString(), LoyaltyCardDbIds.BARCODE_TYPE, Color.BLACK, 1);
 
         // Get card
         LoyaltyCard card = db.getLoyaltyCard(1);
@@ -50,7 +50,6 @@ public class ImportURITest {
         assertEquals(card.barcodeType, parsedCard.barcodeType);
         assertEquals(card.cardId, parsedCard.cardId);
         assertEquals(card.headerColor, parsedCard.headerColor);
-        assertEquals(card.headerTextColor, parsedCard.headerTextColor);
         assertEquals(card.note, parsedCard.note);
         assertEquals(card.store, parsedCard.store);
         // No export of starStatus for single cards foreseen therefore 0 will be imported
@@ -61,7 +60,7 @@ public class ImportURITest {
     public void ensureNoCrashOnMissingHeaderFields() throws InvalidObjectException
     {
         // Generate card
-        db.insertLoyaltyCard("store", "note", BarcodeFormat.UPC_A.toString(), LoyaltyCardDbIds.BARCODE_TYPE, null, null, 0);
+        db.insertLoyaltyCard("store", "note", BarcodeFormat.UPC_A.toString(), LoyaltyCardDbIds.BARCODE_TYPE, null, 0);
 
         // Get card
         LoyaltyCard card = db.getLoyaltyCard(1);
@@ -97,7 +96,7 @@ public class ImportURITest {
     {
         try {
             //"stare" instead of store
-            importURIHelper.parse(Uri.parse("https://brarcher.github.io/loyalty-card-locker/share?stare=store&note=note&cardid=12345&barcodetype=ITF&headercolor=-416706&headertextcolor=-1"));
+            importURIHelper.parse(Uri.parse("https://brarcher.github.io/loyalty-card-locker/share?stare=store&note=note&cardid=12345&barcodetype=ITF&headercolor=-416706"));
             assertTrue(false); // Shouldn't get here
         } catch(InvalidObjectException ex) {
             // Desired behaviour
@@ -120,7 +119,6 @@ public class ImportURITest {
         assertEquals("note", parsedCard.note);
         assertEquals("store", parsedCard.store);
         assertEquals(Integer.valueOf(-416706), parsedCard.headerColor);
-        assertEquals(Integer.valueOf(-1), parsedCard.headerTextColor);
         assertEquals(0, parsedCard.starStatus);
     }
 }

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

@@ -84,7 +84,7 @@ public class LoyaltyCardCursorAdapterTest
     @Test
     public void TestCursorAdapterEmptyNote()
     {
-        db.insertLoyaltyCard("store", "", "cardId", BarcodeFormat.UPC_A.toString(), Color.BLACK, Color.WHITE, 0);
+        db.insertLoyaltyCard("store", "", "cardId", BarcodeFormat.UPC_A.toString(), Color.BLACK, 0);
         LoyaltyCard card = db.getLoyaltyCard(1);
 
         Cursor cursor = db.getLoyaltyCardCursor();
@@ -98,7 +98,7 @@ public class LoyaltyCardCursorAdapterTest
     @Test
     public void TestCursorAdapterWithNote()
     {
-        db.insertLoyaltyCard("store", "note", "cardId", BarcodeFormat.UPC_A.toString(), Color.BLACK, Color.WHITE, 0);
+        db.insertLoyaltyCard("store", "note", "cardId", BarcodeFormat.UPC_A.toString(), Color.BLACK, 0);
         LoyaltyCard card = db.getLoyaltyCard(1);
 
         Cursor cursor = db.getLoyaltyCardCursor();
@@ -112,7 +112,7 @@ public class LoyaltyCardCursorAdapterTest
     @Test
     public void TestCursorAdapterFontSizes()
     {
-        db.insertLoyaltyCard("store", "note", "cardId", BarcodeFormat.UPC_A.toString(), Color.BLACK, Color.WHITE, 0);
+        db.insertLoyaltyCard("store", "note", "cardId", BarcodeFormat.UPC_A.toString(), Color.BLACK, 0);
         LoyaltyCard card = db.getLoyaltyCard(1);
 
         Cursor cursor = db.getLoyaltyCardCursor();
@@ -130,9 +130,9 @@ public class LoyaltyCardCursorAdapterTest
     @Test
     public void TestCursorAdapterStarring()
     {
-        db.insertLoyaltyCard("storeA", "note", "cardId", BarcodeFormat.UPC_A.toString(), Color.BLACK, Color.WHITE, 0);
-        db.insertLoyaltyCard("storeB", "note", "cardId", BarcodeFormat.UPC_A.toString(), Color.BLACK, Color.WHITE, 1);
-        db.insertLoyaltyCard("storeC", "note", "cardId", BarcodeFormat.UPC_A.toString(), Color.BLACK, Color.WHITE, 1);
+        db.insertLoyaltyCard("storeA", "note", "cardId", BarcodeFormat.UPC_A.toString(), Color.BLACK, 0);
+        db.insertLoyaltyCard("storeB", "note", "cardId", BarcodeFormat.UPC_A.toString(), Color.BLACK, 1);
+        db.insertLoyaltyCard("storeC", "note", "cardId", BarcodeFormat.UPC_A.toString(), Color.BLACK, 1);
 
 
         Cursor cursor = db.getLoyaltyCardCursor();

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

@@ -5,7 +5,6 @@ import static org.junit.Assert.assertNotEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
 import static org.robolectric.Shadows.shadowOf;
-import static protect.card_locker.LoyaltyCardEditActivity.NO_BARCODE;
 
 import android.app.Activity;
 import android.content.Intent;
@@ -111,7 +110,7 @@ public class LoyaltyCardViewActivityTest
         final EditText storeField = activity.findViewById(R.id.storeNameEdit);
         final EditText noteField = activity.findViewById(R.id.noteEdit);
         final TextView cardIdField = activity.findViewById(R.id.cardIdView);
-        final TextView barcodeTypeField = activity.findViewById(R.id.barcodeTypeView);
+        final TextView barcodeTypeField = activity.findViewById(R.id.barcodeTypeField);
 
         storeField.setText(store);
         noteField.setText(note);
@@ -130,7 +129,7 @@ public class LoyaltyCardViewActivityTest
         assertEquals(cardId, card.cardId);
 
         // The special "No barcode" string shouldn't actually be written to the loyalty card
-        if(barcodeType.equals(NO_BARCODE))
+        if(barcodeType.equals(activity.getApplicationContext().getString(R.string.noBarcode)))
         {
             assertEquals("", card.barcodeType);
         }
@@ -238,10 +237,9 @@ public class LoyaltyCardViewActivityTest
 
             checkFieldProperties(activity, R.id.storeNameEdit, editVisibility, store);
             checkFieldProperties(activity, R.id.noteEdit, editVisibility, note);
+            checkFieldProperties(activity, R.id.cardAndBarcodeLayout, cardId.isEmpty() ? View.GONE : View.VISIBLE, null);
             checkFieldProperties(activity, R.id.cardIdView, View.VISIBLE, cardId);
-            checkFieldProperties(activity, R.id.cardIdDivider, cardId.isEmpty() ? View.GONE : View.VISIBLE, null);
-            checkFieldProperties(activity, R.id.cardIdTableRow, cardId.isEmpty() ? View.GONE : View.VISIBLE, null);
-            checkFieldProperties(activity, R.id.barcodeTypeView, View.VISIBLE, barcodeType);
+            checkFieldProperties(activity, R.id.barcodeTypeField, View.VISIBLE, barcodeType);
             checkFieldProperties(activity, R.id.captureButton, captureVisibility, null);
             checkFieldProperties(activity, R.id.barcode, View.VISIBLE, null);
         }
@@ -258,7 +256,7 @@ public class LoyaltyCardViewActivityTest
         Activity activity = (Activity)activityController.get();
 
         checkAllFields(activity, ViewMode.ADD_CARD, "", "", "", "");
-        assertEquals(View.GONE, activity.findViewById(R.id.barcodeTypeTableRow).getVisibility());
+        assertEquals(View.GONE, activity.findViewById(R.id.cardAndBarcodeLayout).getVisibility());
     }
 
     @Test
@@ -400,7 +398,7 @@ public class LoyaltyCardViewActivityTest
         Activity activity = (Activity)activityController.get();
         DBHelper db = new DBHelper(activity);
 
-        db.insertLoyaltyCard("store", "note", BARCODE_DATA, BARCODE_TYPE, Color.BLACK, Color.WHITE, 0);
+        db.insertLoyaltyCard("store", "note", BARCODE_DATA, BARCODE_TYPE, Color.BLACK, 0);
 
         activityController.start();
         activityController.visible();
@@ -416,7 +414,7 @@ public class LoyaltyCardViewActivityTest
         Activity activity = (Activity)activityController.get();
         DBHelper db = new DBHelper(activity);
 
-        db.insertLoyaltyCard("store", "note", BARCODE_DATA, BARCODE_TYPE, Color.BLACK, Color.WHITE, 0);
+        db.insertLoyaltyCard("store", "note", BARCODE_DATA, BARCODE_TYPE, Color.BLACK, 0);
 
         activityController.start();
         activityController.visible();
@@ -432,7 +430,7 @@ public class LoyaltyCardViewActivityTest
         Activity activity = (Activity)activityController.get();
         DBHelper db = new DBHelper(activity);
 
-        db.insertLoyaltyCard("store", "note", EAN_BARCODE_DATA, EAN_BARCODE_TYPE, Color.BLACK, Color.WHITE, 0);
+        db.insertLoyaltyCard("store", "note", EAN_BARCODE_DATA, EAN_BARCODE_TYPE, Color.BLACK, 0);
 
         activityController.start();
         activityController.visible();
@@ -453,7 +451,7 @@ public class LoyaltyCardViewActivityTest
         Activity activity = (Activity)activityController.get();
         DBHelper db = new DBHelper(activity);
 
-        db.insertLoyaltyCard("store", "note", EAN_BARCODE_DATA, EAN_BARCODE_TYPE, Color.BLACK, Color.WHITE, 0);
+        db.insertLoyaltyCard("store", "note", EAN_BARCODE_DATA, EAN_BARCODE_TYPE, Color.BLACK, 0);
 
         activityController.start();
         activityController.visible();
@@ -479,7 +477,7 @@ public class LoyaltyCardViewActivityTest
         Activity activity = (Activity)activityController.get();
         DBHelper db = new DBHelper(activity);
 
-        db.insertLoyaltyCard("store", "note", BARCODE_DATA, BARCODE_TYPE, Color.BLACK, Color.WHITE, 0);
+        db.insertLoyaltyCard("store", "note", BARCODE_DATA, BARCODE_TYPE, Color.BLACK, 0);
 
         activityController.start();
         activityController.visible();
@@ -523,7 +521,7 @@ public class LoyaltyCardViewActivityTest
 
         Activity activity = (Activity)activityController.get();
         DBHelper db = new DBHelper(activity);
-        db.insertLoyaltyCard("store", "note", BARCODE_DATA, BARCODE_TYPE, Color.BLACK, Color.WHITE, 0);
+        db.insertLoyaltyCard("store", "note", BARCODE_DATA, BARCODE_TYPE, Color.BLACK, 0);
 
         activityController.start();
         activityController.visible();
@@ -541,7 +539,7 @@ public class LoyaltyCardViewActivityTest
 
         Activity activity = (Activity)activityController.get();
         DBHelper db = new DBHelper(activity);
-        db.insertLoyaltyCard("store", "note", BARCODE_DATA, BARCODE_TYPE, null, null, 0);
+        db.insertLoyaltyCard("store", "note", BARCODE_DATA, BARCODE_TYPE, null, 0);
 
         activityController.start();
         activityController.visible();
@@ -559,7 +557,7 @@ public class LoyaltyCardViewActivityTest
 
         Activity activity = (Activity)activityController.get();
         DBHelper db = new DBHelper(activity);
-        db.insertLoyaltyCard("store", "note", BARCODE_DATA, BARCODE_TYPE, null, null, 0);
+        db.insertLoyaltyCard("store", "note", BARCODE_DATA, BARCODE_TYPE, null, 0);
 
         activityController.start();
         activityController.visible();
@@ -576,14 +574,14 @@ public class LoyaltyCardViewActivityTest
 
         Activity activity = (Activity)activityController.get();
         DBHelper db = new DBHelper(activity);
-        db.insertLoyaltyCard("store", "note", BARCODE_DATA, "", Color.BLACK, Color.WHITE, 0);
+        db.insertLoyaltyCard("store", "note", BARCODE_DATA, "", Color.BLACK, 0);
 
         activityController.start();
         activityController.visible();
         activityController.resume();
 
         // Save and check the loyalty card
-        saveLoyaltyCardWithArguments(activity, "store", "note", BARCODE_DATA, NO_BARCODE, false);
+        saveLoyaltyCardWithArguments(activity, "store", "note", BARCODE_DATA, activity.getApplicationContext().getString(R.string.noBarcode), false);
     }
 
     @Test
@@ -593,7 +591,7 @@ public class LoyaltyCardViewActivityTest
         Activity activity = (Activity)activityController.get();
         DBHelper db = new DBHelper(activity);
 
-        db.insertLoyaltyCard("store", "note", BARCODE_DATA, BARCODE_TYPE, Color.BLACK, Color.WHITE, 0);
+        db.insertLoyaltyCard("store", "note", BARCODE_DATA, BARCODE_TYPE, Color.BLACK, 0);
 
         activityController.start();
         activityController.visible();
@@ -606,11 +604,11 @@ public class LoyaltyCardViewActivityTest
         selectBarcodeWithResult(activity, R.id.enterButton, BARCODE_DATA, "", true);
 
         // Check if the barcode type is NO_BARCODE as expected
-        checkAllFields(activity, ViewMode.UPDATE_CARD, "store", "note", BARCODE_DATA, NO_BARCODE);
-        assertEquals(View.GONE, activity.findViewById(R.id.barcodeTypeTableRow).getVisibility());
+        checkAllFields(activity, ViewMode.UPDATE_CARD, "store", "note", BARCODE_DATA, activity.getApplicationContext().getString(R.string.noBarcode));
+        assertEquals(View.GONE, activity.findViewById(R.id.barcodeLayout).getVisibility());
 
         // Check if the special NO_BARCODE string doesn't get saved
-        saveLoyaltyCardWithArguments(activity, "store", "note", BARCODE_DATA, NO_BARCODE, false);
+        saveLoyaltyCardWithArguments(activity, "store", "note", BARCODE_DATA, activity.getApplicationContext().getString(R.string.noBarcode), false);
     }
 
     @Test
@@ -620,7 +618,7 @@ public class LoyaltyCardViewActivityTest
 
         Activity activity = (Activity)activityController.get();
         DBHelper db = new DBHelper(activity);
-        db.insertLoyaltyCard("store", "note", BARCODE_DATA, BARCODE_TYPE, Color.BLACK, Color.WHITE, 0);
+        db.insertLoyaltyCard("store", "note", BARCODE_DATA, BARCODE_TYPE, Color.BLACK, 0);
 
         final int STORE_FONT_SIZE = 50;
         final int CARD_FONT_SIZE = 40;
@@ -662,7 +660,7 @@ public class LoyaltyCardViewActivityTest
 
             Activity activity = (Activity)activityController.get();
             DBHelper db = new DBHelper(activity);
-            db.insertLoyaltyCard("store", "note", BARCODE_DATA, BARCODE_TYPE, Color.BLACK, Color.WHITE, 0);
+            db.insertLoyaltyCard("store", "note", BARCODE_DATA, BARCODE_TYPE, Color.BLACK, 0);
 
             SharedPreferences settings = PreferenceManager.getDefaultSharedPreferences(activity);
             settings.edit()
@@ -697,7 +695,7 @@ public class LoyaltyCardViewActivityTest
 
         Activity activity = (Activity) activityController.get();
         DBHelper db = new DBHelper(activity);
-        db.insertLoyaltyCard("store", "note", BARCODE_DATA, BARCODE_TYPE, Color.BLACK, Color.WHITE,0);
+        db.insertLoyaltyCard("store", "note", BARCODE_DATA, BARCODE_TYPE, Color.BLACK,0);
         activityController.start();
         activityController.visible();
         activityController.resume();
@@ -726,7 +724,7 @@ public class LoyaltyCardViewActivityTest
 
         Activity activity = (Activity)activityController.get();
         DBHelper db = new DBHelper(activity);
-        db.insertLoyaltyCard("store", "note", BARCODE_DATA, BARCODE_TYPE, Color.BLACK, Color.WHITE, 0);
+        db.insertLoyaltyCard("store", "note", BARCODE_DATA, BARCODE_TYPE, Color.BLACK, 0);
 
         activityController.start();
         activityController.visible();
@@ -799,8 +797,7 @@ public class LoyaltyCardViewActivityTest
         Activity activity = (Activity)activityController.get();
 
         checkAllFields(activity, ViewMode.ADD_CARD, "Example Store", "", "123456", "AZTEC");
-        assertEquals(-416706, ((ColorDrawable) activity.findViewById(R.id.headingColorSample).getBackground()).getColor());
-        assertEquals(-1, ((ColorDrawable) activity.findViewById(R.id.headingStoreTextColorSample).getBackground()).getColor());
+        assertEquals(-416706, ((ColorDrawable) activity.findViewById(R.id.thumbnail).getBackground()).getColor());
     }
 
     @Test
@@ -820,7 +817,6 @@ public class LoyaltyCardViewActivityTest
         Activity activity = (Activity)activityController.get();
 
         checkAllFields(activity, ViewMode.ADD_CARD, "Example Store", "", "123456", "AZTEC");
-        assertEquals(-416706, ((ColorDrawable) activity.findViewById(R.id.headingColorSample).getBackground()).getColor());
-        assertEquals(-1, ((ColorDrawable) activity.findViewById(R.id.headingStoreTextColorSample).getBackground()).getColor());
+        assertEquals(-416706, ((ColorDrawable) activity.findViewById(R.id.thumbnail).getBackground()).getColor());
     }
 }

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

@@ -2,28 +2,28 @@ package protect.card_locker;
 
 import android.app.Activity;
 import android.content.ComponentName;
-import android.content.Context;
 import android.content.Intent;
 import android.content.SharedPreferences;
 import android.database.Cursor;
 import android.graphics.Color;
-import android.os.Bundle;
 import android.view.Menu;
 import android.view.View;
 import android.widget.ListView;
 import android.widget.TextView;
 
+import com.google.android.material.tabs.TabLayout;
 import com.google.zxing.BarcodeFormat;
 
-import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.robolectric.Robolectric;
 import org.robolectric.RobolectricTestRunner;
-import org.robolectric.RuntimeEnvironment;
 import org.robolectric.annotation.Config;
 import org.robolectric.android.controller.ActivityController;
 
+import java.util.ArrayList;
+import java.util.List;
+
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;
@@ -60,9 +60,10 @@ public class MainActivityTest
         final Menu menu = shadowOf(activity).getOptionsMenu();
         assertTrue(menu != null);
 
-        // The settings, search and add button should be present
-        assertEquals(menu.size(), 4);
+        // The settings, import/export, groups, search and add button should be present
+        assertEquals(menu.size(), 5);
         assertEquals("Search", menu.findItem(R.id.action_search).getTitle().toString());
+        assertEquals("Groups", menu.findItem(R.id.action_manage_groups).getTitle().toString());
         assertEquals("Import/Export", menu.findItem(R.id.action_import_export).getTitle().toString());
         assertEquals("About", menu.findItem(R.id.action_about).getTitle().toString());
         assertEquals("Settings", menu.findItem(R.id.action_settings).getTitle().toString());
@@ -97,7 +98,7 @@ public class MainActivityTest
         assertEquals(0, list.getCount());
 
         DBHelper db = new DBHelper(mainActivity);
-        db.insertLoyaltyCard("store", "note", "cardId", BarcodeFormat.UPC_A.toString(), Color.BLACK, Color.WHITE, 0);
+        db.insertLoyaltyCard("store", "note", "cardId", BarcodeFormat.UPC_A.toString(), Color.BLACK, 0);
 
         assertEquals(View.VISIBLE, helpText.getVisibility());
         assertEquals(View.GONE, noMatchingCardsText.getVisibility());
@@ -131,10 +132,10 @@ public class MainActivityTest
         assertEquals(0, list.getCount());
 
         DBHelper db = new DBHelper(mainActivity);
-        db.insertLoyaltyCard("storeB", "note", "cardId", BarcodeFormat.UPC_A.toString(), Color.BLACK, Color.WHITE, 0);
-        db.insertLoyaltyCard("storeA", "note", "cardId", BarcodeFormat.UPC_A.toString(), Color.BLACK, Color.WHITE, 0);
-        db.insertLoyaltyCard("storeD", "note", "cardId", BarcodeFormat.UPC_A.toString(), Color.BLACK, Color.WHITE, 1);
-        db.insertLoyaltyCard("storeC", "note", "cardId", BarcodeFormat.UPC_A.toString(), Color.BLACK, Color.WHITE, 1);
+        db.insertLoyaltyCard("storeB", "note", "cardId", BarcodeFormat.UPC_A.toString(), Color.BLACK, 0);
+        db.insertLoyaltyCard("storeA", "note", "cardId", BarcodeFormat.UPC_A.toString(), Color.BLACK, 0);
+        db.insertLoyaltyCard("storeD", "note", "cardId", BarcodeFormat.UPC_A.toString(), Color.BLACK, 1);
+        db.insertLoyaltyCard("storeC", "note", "cardId", BarcodeFormat.UPC_A.toString(), Color.BLACK, 1);
 
         assertEquals(View.VISIBLE, helpText.getVisibility());
         assertEquals(View.GONE, noMatchingCardsText.getVisibility());
@@ -165,6 +166,54 @@ public class MainActivityTest
         assertEquals("storeB",cursor.getString(cursor.getColumnIndex("store")));
     }
 
+    @Test
+    public void testGroups()
+    {
+        ActivityController activityController = Robolectric.buildActivity(MainActivity.class).create();
+
+        Activity mainActivity = (Activity)activityController.get();
+        activityController.start();
+        activityController.resume();
+
+        DBHelper db = new DBHelper(mainActivity);
+
+        TabLayout groupTabs = mainActivity.findViewById(R.id.groups);
+
+        // No group tabs by default
+        assertEquals(0, groupTabs.getTabCount());
+
+        // Having at least one group should create two tabs: One all and one for each group
+        db.insertGroup("One");
+        activityController.pause();
+        activityController.resume();
+        assertEquals(2, groupTabs.getTabCount());
+        assertEquals("All", groupTabs.getTabAt(0).getText().toString());
+        assertEquals("One", groupTabs.getTabAt(1).getText().toString());
+
+        // Adding another group should have them sorted alphabetically
+        db.insertGroup("Alphabetical two");
+        activityController.pause();
+        activityController.resume();
+        assertEquals(3, groupTabs.getTabCount());
+        assertEquals("All", groupTabs.getTabAt(0).getText().toString());
+        assertEquals("Alphabetical two", groupTabs.getTabAt(1).getText().toString());
+        assertEquals("One", groupTabs.getTabAt(2).getText().toString());
+
+        // Removing a group should also change the list
+        db.deleteGroup("Alphabetical two");
+        activityController.pause();
+        activityController.resume();
+        assertEquals(2, groupTabs.getTabCount());
+        assertEquals("All", groupTabs.getTabAt(0).getText().toString());
+        assertEquals("One", groupTabs.getTabAt(1).getText().toString());
+
+        // Removing the last group should make the tabs disappear
+        db.deleteGroup("One");
+        activityController.pause();
+        activityController.resume();
+        assertEquals(0, groupTabs.getTabCount());
+    }
+
     @Test
     public void testFiltering()
     {
@@ -177,10 +226,16 @@ public class MainActivityTest
         TextView helpText = mainActivity.findViewById(R.id.helpText);
         TextView noMatchingCardsText = mainActivity.findViewById(R.id.noMatchingCardsText);
         ListView list = mainActivity.findViewById(R.id.list);
+        TabLayout groupTabs = mainActivity.findViewById(R.id.groups);
 
         DBHelper db = new DBHelper(mainActivity);
-        db.insertLoyaltyCard("The First Store", "Initial note", "cardId", BarcodeFormat.UPC_A.toString(), Color.BLACK, Color.WHITE, 0);
-        db.insertLoyaltyCard("The Second Store", "Secondary note", "cardId", BarcodeFormat.UPC_A.toString(), Color.BLACK, Color.WHITE, 0);
+        db.insertLoyaltyCard("The First Store", "Initial note", "cardId", BarcodeFormat.UPC_A.toString(), Color.BLACK, 0);
+        db.insertLoyaltyCard("The Second Store", "Secondary note", "cardId", BarcodeFormat.UPC_A.toString(), Color.BLACK, 0);
+
+        db.insertGroup("Group one");
+        List<Group> groups = new ArrayList<>();
+        groups.add(db.getGroup("Group one"));
+        db.setLoyaltyCardGroups(1, groups);
 
         activityController.pause();
         activityController.resume();
@@ -202,6 +257,27 @@ public class MainActivityTest
 
         assertEquals(2, list.getCount());
 
+        // Switch to Group one
+        groupTabs.selectTab(groupTabs.getTabAt(1));
+
+        activityController.pause();
+        activityController.resume();
+
+        assertEquals(View.GONE, helpText.getVisibility());
+        assertEquals(View.GONE, noMatchingCardsText.getVisibility());
+        assertEquals(View.VISIBLE, list.getVisibility());
+
+        assertEquals(1, list.getCount());
+
+        // Switch back to all groups
+        groupTabs.selectTab(groupTabs.getTabAt(0));
+
+        assertEquals(View.GONE, helpText.getVisibility());
+        assertEquals(View.GONE, noMatchingCardsText.getVisibility());
+        assertEquals(View.VISIBLE, list.getVisibility());
+
+        assertEquals(2, list.getCount());
+
         mainActivity.filter = "first";
 
         activityController.pause();
@@ -213,6 +289,27 @@ public class MainActivityTest
 
         assertEquals(1, list.getCount());
 
+        // Switch to Group one
+        groupTabs.selectTab(groupTabs.getTabAt(1));
+
+        activityController.pause();
+        activityController.resume();
+
+        assertEquals(View.GONE, helpText.getVisibility());
+        assertEquals(View.GONE, noMatchingCardsText.getVisibility());
+        assertEquals(View.VISIBLE, list.getVisibility());
+
+        assertEquals(1, list.getCount());
+
+        // Switch back to all groups
+        groupTabs.selectTab(groupTabs.getTabAt(0));
+
+        assertEquals(View.GONE, helpText.getVisibility());
+        assertEquals(View.GONE, noMatchingCardsText.getVisibility());
+        assertEquals(View.VISIBLE, list.getVisibility());
+
+        assertEquals(1, list.getCount());
+
         mainActivity.filter = "initial";
 
         activityController.pause();
@@ -224,6 +321,27 @@ public class MainActivityTest
 
         assertEquals(1, list.getCount());
 
+        // Switch to Group one
+        groupTabs.selectTab(groupTabs.getTabAt(1));
+
+        activityController.pause();
+        activityController.resume();
+
+        assertEquals(View.GONE, helpText.getVisibility());
+        assertEquals(View.GONE, noMatchingCardsText.getVisibility());
+        assertEquals(View.VISIBLE, list.getVisibility());
+
+        assertEquals(1, list.getCount());
+
+        // Switch back to all groups
+        groupTabs.selectTab(groupTabs.getTabAt(0));
+
+        assertEquals(View.GONE, helpText.getVisibility());
+        assertEquals(View.GONE, noMatchingCardsText.getVisibility());
+        assertEquals(View.VISIBLE, list.getVisibility());
+
+        assertEquals(1, list.getCount());
+
         mainActivity.filter = "second";
 
         activityController.pause();
@@ -235,6 +353,27 @@ public class MainActivityTest
 
         assertEquals(1, list.getCount());
 
+        // Switch to Group one
+        groupTabs.selectTab(groupTabs.getTabAt(1));
+
+        activityController.pause();
+        activityController.resume();
+
+        assertEquals(View.GONE, helpText.getVisibility());
+        assertEquals(View.VISIBLE, noMatchingCardsText.getVisibility());
+        assertEquals(View.VISIBLE, list.getVisibility());
+
+        assertEquals(0, list.getCount());
+
+        // Switch back to all groups
+        groupTabs.selectTab(groupTabs.getTabAt(0));
+
+        assertEquals(View.GONE, helpText.getVisibility());
+        assertEquals(View.GONE, noMatchingCardsText.getVisibility());
+        assertEquals(View.VISIBLE, list.getVisibility());
+
+        assertEquals(1, list.getCount());
+
         mainActivity.filter = "company";
 
         activityController.pause();
@@ -246,6 +385,27 @@ public class MainActivityTest
 
         assertEquals(0, list.getCount());
 
+        // Switch to Group one
+        groupTabs.selectTab(groupTabs.getTabAt(1));
+
+        activityController.pause();
+        activityController.resume();
+
+        assertEquals(View.GONE, helpText.getVisibility());
+        assertEquals(View.VISIBLE, noMatchingCardsText.getVisibility());
+        assertEquals(View.VISIBLE, list.getVisibility());
+
+        assertEquals(0, list.getCount());
+
+        // Switch back to all groups
+        groupTabs.selectTab(groupTabs.getTabAt(0));
+
+        assertEquals(View.GONE, helpText.getVisibility());
+        assertEquals(View.VISIBLE, noMatchingCardsText.getVisibility());
+        assertEquals(View.VISIBLE, list.getVisibility());
+
+        assertEquals(0, list.getCount());
+
         mainActivity.filter = "";
 
         activityController.pause();
@@ -256,5 +416,26 @@ public class MainActivityTest
         assertEquals(View.VISIBLE, list.getVisibility());
 
         assertEquals(2, list.getCount());
+
+        // Switch to Group one
+        groupTabs.selectTab(groupTabs.getTabAt(1));
+
+        activityController.pause();
+        activityController.resume();
+
+        assertEquals(View.GONE, helpText.getVisibility());
+        assertEquals(View.GONE, noMatchingCardsText.getVisibility());
+        assertEquals(View.VISIBLE, list.getVisibility());
+
+        assertEquals(1, list.getCount());
+
+        // Switch back to all groups
+        groupTabs.selectTab(groupTabs.getTabAt(0));
+
+        assertEquals(View.GONE, helpText.getVisibility());
+        assertEquals(View.GONE, noMatchingCardsText.getVisibility());
+        assertEquals(View.VISIBLE, list.getVisibility());
+
+        assertEquals(2, list.getCount());
     }
 }

docs/README.md

@@ -1,5 +1,6 @@
 # Catima
 ![Android CI](https://github.com/TheLastProject/Catima/workflows/Android%20CI/badge.svg)
+[![Translation status](https://hosted.weblate.org/widgets/catima/-/svg-badge.svg)](https://hosted.weblate.org/engage/catima/)
 
 <a href="https://f-droid.org/repository/browse/?fdid=me.hackerchick.catima" target="_blank">
 <img src="https://fdroid.gitlab.io/artwork/badge/get-it-on.png" alt="Get it on F-Droid" height="90"/></a>
@@ -26,16 +27,14 @@ Stores all of your store loyalty cards on your phone, removing the need to carry
 
 # Screenshots
 
-[<img src="https://github.com/TheLastProject/Catima/raw/master/metadata/en-US/images/phoneScreenshots/screenshot-01.png" width=250>](https://github.com/TheLastProject/Catima/raw/master/metadata/en-US/images/phoneScreenshots/screenshot-01.png)
-[<img src="https://github.com/TheLastProject/Catima/raw/master/metadata/en-US/images/phoneScreenshots/screenshot-02.png" width=250>](https://github.com/TheLastProject/Catima/raw/master/metadata/en-US/images/phoneScreenshots/screenshot-02.png)
-[<img src="https://github.com/TheLastProject/Catima/raw/master/metadata/en-US/images/phoneScreenshots/screenshot-03.png" width=250>](https://github.com/TheLastProject/Catima/raw/master/metadata/en-US/images/phoneScreenshots/screenshot-03.png)
-[<img src="https://github.com/TheLastProject/Catima/raw/master/metadata/en-US/images/phoneScreenshots/screenshot-04.png" width=250>](https://github.com/TheLastProject/Catima/raw/master/metadata/en-US/images/phoneScreenshots/screenshot-04.png)
-[<img src="https://github.com/TheLastProject/Catima/raw/master/metadata/en-US/images/phoneScreenshots/screenshot-05.png" width=250>](https://github.com/TheLastProject/Catima/raw/master/metadata/en-US/images/phoneScreenshots/screenshot-05.png)
-[<img src="https://github.com/TheLastProject/Catima/raw/master/metadata/en-US/images/phoneScreenshots/screenshot-06.png" width=250>](https://github.com/TheLastProject/Catima/raw/master/metadata/en-US/images/phoneScreenshots/screenshot-06.png)
-[<img src="https://github.com/TheLastProject/Catima/raw/master/metadata/en-US/images/phoneScreenshots/screenshot-07.png" width=250>](https://github.com/TheLastProject/Catima/raw/master/metadata/en-US/images/phoneScreenshots/screenshot-07.png)
-[<img src="https://github.com/TheLastProject/Catima/raw/master/metadata/en-US/images/phoneScreenshots/screenshot-08.png" width=250>](https://github.com/TheLastProject/Catima/raw/master/metadata/en-US/images/phoneScreenshots/screenshot-08.png)
-[<img src="https://github.com/TheLastProject/Catima/raw/master/metadata/en-US/images/phoneScreenshots/screenshot-09.png" width=250>](https://github.com/TheLastProject/Catima/raw/master/metadata/en-US/images/phoneScreenshots/screenshot-09.png)
-[<img src="https://github.com/TheLastProject/Catima/raw/master/metadata/en-US/images/phoneScreenshots/screenshot-10.png" width=250>](https://github.com/TheLastProject/Catima/raw/master/metadata/en-US/images/phoneScreenshots/screenshot-10.png)
+[<img src="https://github.com/TheLastProject/Catima/raw/master/fastlane/metadata/android/en-US/images/phoneScreenshots/screenshot-01.png" width=250>](https://github.com/TheLastProject/Catima/raw/master/fastlane/metadata/android/en-US/images/phoneScreenshots/screenshot-01.png)
+[<img src="https://github.com/TheLastProject/Catima/raw/master/fastlane/metadata/android/en-US/images/phoneScreenshots/screenshot-02.png" width=250>](https://github.com/TheLastProject/Catima/raw/master/fastlane/metadata/android/en-US/images/phoneScreenshots/screenshot-02.png)
+[<img src="https://github.com/TheLastProject/Catima/raw/master/fastlane/metadata/android/en-US/images/phoneScreenshots/screenshot-03.png" width=250>](https://github.com/TheLastProject/Catima/raw/master/fastlane/metadata/android/en-US/images/phoneScreenshots/screenshot-03.png)
+[<img src="https://github.com/TheLastProject/Catima/raw/master/fastlane/metadata/android/en-US/images/phoneScreenshots/screenshot-04.png" width=250>](https://github.com/TheLastProject/Catima/raw/master/fastlane/metadata/android/en-US/images/phoneScreenshots/screenshot-04.png)
+[<img src="https://github.com/TheLastProject/Catima/raw/master/fastlane/metadata/android/en-US/images/phoneScreenshots/screenshot-05.png" width=250>](https://github.com/TheLastProject/Catima/raw/master/fastlane/metadata/android/en-US/images/phoneScreenshots/screenshot-05.png)
+[<img src="https://github.com/TheLastProject/Catima/raw/master/fastlane/metadata/android/en-US/images/phoneScreenshots/screenshot-06.png" width=250>](https://github.com/TheLastProject/Catima/raw/master/fastlane/metadata/android/en-US/images/phoneScreenshots/screenshot-06.png)
+[<img src="https://github.com/TheLastProject/Catima/raw/master/fastlane/metadata/android/en-US/images/phoneScreenshots/screenshot-07.png" width=250>](https://github.com/TheLastProject/Catima/raw/master/fastlane/metadata/android/en-US/images/phoneScreenshots/screenshot-07.png)
+[<img src="https://github.com/TheLastProject/Catima/raw/master/fastlane/metadata/android/en-US/images/phoneScreenshots/screenshot-08.png" width=250>](https://github.com/TheLastProject/Catima/raw/master/fastlane/metadata/android/en-US/images/phoneScreenshots/screenshot-08.png)
 
 # Migrating from other apps
 
@@ -58,7 +57,7 @@ Windows:
 
 # Translating
 
-We are going to set up a translation platform soon, please check back later.
+Please contribute through [our Weblate page](https://hosted.weblate.org/projects/catima/).
 
 # Thanks
 

docs/migrate/protect_card_locker/index.md

@@ -21,15 +21,18 @@ As Catima is based on Loyalty Card Keychain, importing your data from it is very
 ![Step 6](step_6.png)
 
 ## 7. Open Catima
-TODO: Logo
+![Step 7](step_7.png)
 
-## 8. Press the Import/Export button in the top right
+## 8. Press the More Options button in the top right
 ![Step 8](step_8.png)
 
-## 9. Press From Filesystem
+## 9. Press Import/Export
 ![Step 9](step_9.png)
 
-## 10. Choose the file you saved in step 5
+## 10. Press From Filesystem
 ![Step 10](step_10.png)
 
+## 11. Choose the file you saved in step 5
+![Step 11](step_11.png)
+
 ## That's it, you've succesfully imported your Loyalty Card Keychain database into Catima

fastlane/Appfile

@@ -0,0 +1,2 @@
+json_key_file("~/.config/google_play_service_account.json") # Path to the json secret file - Follow https://docs.fastlane.tools/actions/supply/#setup to get one
+package_name("me.hackerchick.catima") # e.g. com.krausefx.app

fastlane/Fastfile

@@ -0,0 +1,38 @@
+# This file contains the fastlane.tools configuration
+# You can find the documentation at https://docs.fastlane.tools
+#
+# For a list of all available actions, check out
+#
+#     https://docs.fastlane.tools/actions
+#
+# For a list of all available plugins, check out
+#
+#     https://docs.fastlane.tools/plugins/available-plugins
+#
+
+# Uncomment the line if you want fastlane to automatically update itself
+# update_fastlane
+
+default_platform(:android)
+
+platform :android do
+  desc "Runs all the tests"
+  lane :test do
+    gradle(task: "test")
+  end
+
+  desc "Submit a new Beta Build to Crashlytics Beta"
+  lane :beta do
+    gradle(task: "clean assembleRelease")
+    crashlytics
+  
+    # sh "your_script.sh"
+    # You can also use other beta testing services here
+  end
+
+  desc "Deploy a new version to the Google Play"
+  lane :deploy do
+    gradle(task: "clean assembleRelease")
+    upload_to_play_store
+  end
+end

fastlane/metadata/android/de-DE/full_description.txt

@@ -0,0 +1,7 @@
+Bist Du es auch leid, beim Bezahlen an der Kasse im Supermarkt jedes mal nach dieser Bonuskarte aus Plastik zu suchen? Genervt davon, dass die Brieftasche durch die ganzen Plastikkarten gefühlte fünf Meter dick ist? Wäre es nicht toll, eine <i>freie</i> Lösung für das Problem zu haben, die Deine Daten nicht noch zusätzlich mit weiteren Anbietern teilt?
+
+<i>Catima</i> ist eine App, die Deine auf Barcodes basierenden Kundenkarten auf Deinem Smartphone verwaltet. <i>Catima</i> ist Open Source und kann eines richtig gut: Deine Karten verwalten!
+
+Neue Karten können mit Leichtigkeit hinzugefügt werden. Entweder nutzt Du die Kamera Deines Smartphones, um den Barcode direkt einzulesen – oder Du gibst die unter selbigem befindliche Ziffernfolge von Hand ein. An der Kasse zeigt <i>Catima</i> sodann den Barcode auf dem Display Deines Smartphones an, sodass er vom Scanner gelesen werden kann. Sollte der Scanner dabei doch einmal streiken (was selten vorkommt – und wenn, dann meist nur bei älteren Scanner-Modellen), kann der Verkäufer die ebenfalls angezeigten Ziffern wiederum auch händisch erfassen.
+
+Die App benötigt nur wenige Berechtigungen – und greift nie auf das Internet zu. <i>Catima</i> bietet auch die Möglichkeit, Deine Kartensammlung zu exportieren sowie zu importieren. Damit kannst Du die Daten z. B. auch auf ein anderes Gerät übertragen – oder etwa nach einem Werksreset wieder neu einlesen.

fastlane/metadata/android/de-DE/short_description.txt

@@ -0,0 +1 @@
+Verwaltet barcode-basierte Kunden-/Treuekarten auf dem Handy

fastlane/metadata/android/de-DE/title.txt

@@ -0,0 +1 @@
+Catima

fastlane/metadata/android/en-US/full_description.txt

@@ -1,6 +1,6 @@
 Are you tired of searching for your plastic reward card while checking out at the store? Are you looking for a free solution which will not take your information?
 
-Loyalty Card Keychain is a application which will store your barcode-based loyalty cards on your phone. The application is open source and tries to do one thing well: manage your cards!
+Catima is a application which will store your barcode-based loyalty cards on your phone. The application is open source and tries to do one thing well: manage your cards!
 
 New cards can be added in a snap. Either use your camera to capture the barcode, or type in the number. When the barcode is loaded at the store and displayed it can be scanned with a modern barcode scanner. (Some stores use older barcode scanners, such as flatbed scanners, instead of image scanners. These cannot read the smartphone's display. Instead, request the clerk to type in the number manually).
 

fastlane/metadata/android/en-US/title.txt

@@ -0,0 +1 @@
+Catima - Card & Ticket Manager

fastlane/metadata/android/fr-FR/full_description.txt

@@ -0,0 +1,7 @@
+En avez-vous marre de chercher votre carte de fidélité en plastique lors de votre commande au magasin ? Vous recherchez une solution gratuite qui ne prendra pas vos informations ?
+
+Catima est une application qui stockera vos cartes de fidélité basées sur des codes-barres sur votre téléphone. Le code de l'application est ouvert et essaye de bien faire une chose : gérer vos cartes !
+
+De nouvelles cartes peuvent être ajoutées en un clin d'œil. Utilisez votre appareil photo pour capturer le code-barres ou saisissez le numéro. Lorsque le code-barres est chargé dans le magasin et affiché, il peut être scanné avec un lecteur de codes-barres moderne. (Certains magasins utilisent des lecteurs de codes-barres plus anciens, tels que des scanneurs à plat, au lieu de scanneurs d'images. Ceux-ci ne peuvent pas lire l'écran du téléphone. À la place, demandez au vendeur de saisir le numéro manuellement).
+
+L'application nécessite très peu d'autorisations et ne tente jamais d'accéder à Internet. Il existe une option pour sauvegarder vos cartes sur le stockage local. De là, vous pouvez envoyer la sauvegarde dans un endroit sûr.

fastlane/metadata/android/fr-FR/short_description.txt

@@ -0,0 +1 @@
+Gère les cartes de fidélité basées sur des codes-barres sur votre téléphone

fastlane/metadata/android/fr-FR/title.txt

@@ -0,0 +1 @@
+Catima

fastlane/metadata/android/nb-NO/full_description.txt

@@ -0,0 +1,7 @@
+Lei av å leite opp stamkundekortet mens du betaler i butikken? Ser du etter en fri løsning som ikke stjeler data?
+
+Catima er et program som lagrer strekkodebaserte stamkundekort på din enhet. Det er fri programvare, og gjør én ting bra, altså håndtering av kort.
+
+Nye kort kan legges til raskt. Bruk enten kamera for å scanne inn strekkoden, eller skriv inn nummeret. Når strekkoden er innlastet på butikken kan den skannes med en moderne strekkodeskanner. (Noen butikker bruker eldre strekkodeskannere, som inkrementelle skannere, istedenfor bildeskannere. Disse kan ikke lese skjermen på en smartelefon. Få isteden en ansatt til å skrive inn nummeret manuelt).
+
+Programmet krever veldig få tilganger, og bruker aldri Internett. Det er et valg om å sikkerhetskopiere kort lokalt. Derfra kan du sende sikkerhetskopien til en trygg plass.

fastlane/metadata/android/nb-NO/short_description.txt

@@ -0,0 +1 @@
+Håndterer strekkortebaserte kundekort på din enhet

fastlane/metadata/android/nb-NO/title.txt

@@ -0,0 +1 @@
+Katima - Kundekort og billett

metadata/en-US/title.txt

@@ -1 +0,0 @@
-Loyalty Card Keychain