Release v0.29

Fix Issue #72

.github/workflows/calibreapp-image-actions.yml

@@ -0,0 +1,31 @@
+name: Compress Images on Push to Master
+on:
+  push:
+    branches:
+      - master
+    paths:
+      - '**.jpg'
+      - '**.jpeg'
+      - '**.png'
+      - '**.webp'
+jobs:
+  build:
+    name: calibreapp/image-actions
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout Repo
+        uses: actions/checkout@master
+      - name: Compress Images
+        id: calibre
+        uses: calibreapp/image-actions@master
+        with:
+          githubToken: ${{ secrets.GITHUB_TOKEN }}
+          compressOnly: true
+      - name: Create New Pull Request If Needed
+        if: steps.calibre.outputs.markdown != ''
+        uses: peter-evans/create-pull-request@master
+        with:
+          title: Compressed Images
+          branch-suffix: timestamp
+          commit-message: Compressed Images
+          body: ${{ steps.calibre.outputs.markdown }}

CHANGELOG.md

@@ -1,3 +1,13 @@
+## v0.29 (2020-10-29)
+
+Changes:
+- Rebrand to Catima
+- Removed intro
+- Add floating action buttons
+- Fix Android 5 crash when opening About screen
+- Add favourites support
+- Fix disabled auto-rotate being ignored
+
 ## v0.28 (2020-03-09)
 
 Changes:

app/build.gradle

@@ -13,8 +13,8 @@ android {
         applicationId "me.hackerchick.catima"
         minSdkVersion 16
         targetSdkVersion 29
-        versionCode 39
-        versionName "0.28"
+        versionCode 40
+        versionName "0.29"
     }
     buildTypes {
         release {
@@ -57,6 +57,9 @@ dependencies {
     compile "com.vanniktech:vntnumberpickerpreference:1.0.0"
     testCompile 'junit:junit:4.12'
     testCompile "org.robolectric:robolectric:4.0.2"
+
+
+
 }
 
 task findbugs(type: FindBugs, dependsOn: 'assembleDebug') {

app/src/androidTest/java/protect/card_locker/ApplicationTest.java

@@ -12,4 +12,4 @@ public class ApplicationTest extends ApplicationTestCase<Application>
     {
         super(Application.class);
     }
-}
+}

app/src/main/AndroidManifest.xml

@@ -42,7 +42,6 @@
         <activity
             android:name=".LoyaltyCardEditActivity"
             android:theme="@style/AppTheme.NoActionBar"
-            android:configChanges="orientation|screenSize"
             android:windowSoftInputMode="stateHidden"
             android:exported="true">
             <intent-filter android:label="@string/app_name">
@@ -62,21 +61,17 @@
             android:name=".BarcodeSelectorActivity"
             android:label="@string/selectBarcodeTitle"
             android:theme="@style/AppTheme.NoActionBar"
-            android:configChanges="orientation|screenSize"
             android:windowSoftInputMode="stateHidden"/>
         <activity
             android:name=".preferences.SettingsActivity"
-            android:label="@string/settings"
-            android:configChanges="orientation|screenSize"/>
+            android:label="@string/settings"/>
         <activity
             android:name=".ImportExportActivity"
             android:label="@string/importExport"
-            android:configChanges="orientation|screenSize"
             android:theme="@style/AppTheme.NoActionBar"/>
         <activity
             android:name=".CardShortcutConfigure"
             android:label="@string/cardShortcut"
-            android:configChanges="orientation|screenSize"
             android:theme="@style/AppTheme.NoActionBar">
             <intent-filter>
                 <action android:name="android.intent.action.CREATE_SHORTCUT"/>

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

@@ -25,7 +25,8 @@ public class CsvDatabaseExporter implements DatabaseExporter
                 DBHelper.LoyaltyCardDbIds.CARD_ID,
                 DBHelper.LoyaltyCardDbIds.HEADER_COLOR,
                 DBHelper.LoyaltyCardDbIds.HEADER_TEXT_COLOR,
-                DBHelper.LoyaltyCardDbIds.BARCODE_TYPE);
+                DBHelper.LoyaltyCardDbIds.BARCODE_TYPE,
+                DBHelper.LoyaltyCardDbIds.STAR_STATUS);
 
         Cursor cursor = db.getLoyaltyCardCursor();
 
@@ -39,7 +40,8 @@ public class CsvDatabaseExporter implements DatabaseExporter
                     card.cardId,
                     card.headerColor,
                     card.headerTextColor,
-                    card.barcodeType);
+                    card.barcodeType,
+                    card.starStatus);
 
             if(Thread.currentThread().isInterrupted())
             {

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

@@ -142,6 +142,14 @@ public class CsvDatabaseImporter implements DatabaseImporter
             headerTextColor = extractInt(DBHelper.LoyaltyCardDbIds.HEADER_TEXT_COLOR, record, true);
         }
 
-        helper.insertLoyaltyCard(database, id, store, note, cardId, barcodeType, headerColor, headerTextColor);
+        int starStatus = 0;
+        try {
+            starStatus = extractInt(DBHelper.LoyaltyCardDbIds.STAR_STATUS, record, false);
+        } catch (FormatException _ ) {
+            // 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);
     }
 }

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

@@ -11,7 +11,7 @@ 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 = 3;
+    public static final int DATABASE_VERSION = 4;
 
     static class LoyaltyCardDbIds
     {
@@ -23,6 +23,7 @@ public class DBHelper extends SQLiteOpenHelper
         public static final String HEADER_TEXT_COLOR = "headertextcolor";
         public static final String CARD_ID = "cardid";
         public static final String BARCODE_TYPE = "barcodetype";
+        public static final String STAR_STATUS = "starstatus";
     }
 
     public DBHelper(Context context)
@@ -41,7 +42,8 @@ public class DBHelper extends SQLiteOpenHelper
                 LoyaltyCardDbIds.HEADER_COLOR + " INTEGER," +
                 LoyaltyCardDbIds.HEADER_TEXT_COLOR + " INTEGER," +
                 LoyaltyCardDbIds.CARD_ID + " TEXT not null," +
-                LoyaltyCardDbIds.BARCODE_TYPE + " TEXT not null)");
+                LoyaltyCardDbIds.BARCODE_TYPE + " TEXT not null," +
+                LoyaltyCardDbIds.STAR_STATUS + " INTEGER DEFAULT '0' )");
     }
 
     @Override
@@ -62,11 +64,18 @@ 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'");
+
+        }
     }
 
     public long insertLoyaltyCard(final String store, final String note, final String cardId,
                                   final String barcodeType, final Integer headerColor,
-                                  final Integer headerTextColor)
+                                  final Integer headerTextColor, final int starStatus)
     {
         SQLiteDatabase db = getWritableDatabase();
         ContentValues contentValues = new ContentValues();
@@ -76,6 +85,7 @@ public class DBHelper extends SQLiteOpenHelper
         contentValues.put(LoyaltyCardDbIds.BARCODE_TYPE, barcodeType);
         contentValues.put(LoyaltyCardDbIds.HEADER_COLOR, headerColor);
         contentValues.put(LoyaltyCardDbIds.HEADER_TEXT_COLOR, headerTextColor);
+        contentValues.put(LoyaltyCardDbIds.STAR_STATUS, starStatus);
         final long newId = db.insert(LoyaltyCardDbIds.TABLE, null, contentValues);
         return newId;
     }
@@ -83,7 +93,7 @@ public class DBHelper extends SQLiteOpenHelper
     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 Integer headerTextColor, final int starStatus)
     {
         ContentValues contentValues = new ContentValues();
         contentValues.put(LoyaltyCardDbIds.ID, id);
@@ -93,6 +103,7 @@ public class DBHelper extends SQLiteOpenHelper
         contentValues.put(LoyaltyCardDbIds.BARCODE_TYPE, barcodeType);
         contentValues.put(LoyaltyCardDbIds.HEADER_COLOR, headerColor);
         contentValues.put(LoyaltyCardDbIds.HEADER_TEXT_COLOR, headerTextColor);
+        contentValues.put(LoyaltyCardDbIds.STAR_STATUS,starStatus);
         final long newId = db.insert(LoyaltyCardDbIds.TABLE, null, contentValues);
         return (newId != -1);
     }
@@ -116,6 +127,17 @@ public class DBHelper extends SQLiteOpenHelper
         return (rowsUpdated == 1);
     }
 
+    public boolean updateLoyaltyCardStarStatus(final int id, final int starStatus)
+    {
+        SQLiteDatabase db = getWritableDatabase();
+        ContentValues contentValues = new ContentValues();
+        contentValues.put(LoyaltyCardDbIds.STAR_STATUS,starStatus);
+        int rowsUpdated = db.update(LoyaltyCardDbIds.TABLE, contentValues,
+                LoyaltyCardDbIds.ID + "=?",
+                new String[]{Integer.toString(id)});
+        return (rowsUpdated == 1);
+    }
+
     public LoyaltyCard getLoyaltyCard(final int id)
     {
         SQLiteDatabase db = getReadableDatabase();
@@ -166,7 +188,7 @@ public class DBHelper extends SQLiteOpenHelper
         Cursor res = db.rawQuery("select * from " + LoyaltyCardDbIds.TABLE +
                 " WHERE " + LoyaltyCardDbIds.STORE + "  LIKE ? " +
                 " OR " + LoyaltyCardDbIds.NOTE + " LIKE ? " +
-                " ORDER BY " + LoyaltyCardDbIds.STORE + " COLLATE NOCASE ASC", selectionArgs, null);
+                " ORDER BY " + LoyaltyCardDbIds.STAR_STATUS + " DESC," + LoyaltyCardDbIds.STORE + " COLLATE NOCASE ASC", selectionArgs, null);
         return res;
     }
 

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

@@ -10,9 +10,12 @@ public class ImportURIHelper {
     private static final String NOTE = DBHelper.LoyaltyCardDbIds.NOTE;
     private static final String CARD_ID = DBHelper.LoyaltyCardDbIds.CARD_ID;
     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;
     private final String path;
@@ -47,6 +50,8 @@ public class ImportURIHelper {
             String note = uri.getQueryParameter(NOTE);
             String cardId = uri.getQueryParameter(CARD_ID);
             String barcodeType = uri.getQueryParameter(BARCODE_TYPE);
+            if (store == null || note == null || cardId == null || barcodeType == null) throw new InvalidObjectException("Not a valid import URI");
+
             String unparsedHeaderColor = uri.getQueryParameter(HEADER_COLOR);
             if(unparsedHeaderColor != null)
             {
@@ -57,7 +62,8 @@ public class ImportURIHelper {
             {
                 headerTextColor = Integer.parseInt(unparsedHeaderTextColor);
             }
-            return new LoyaltyCard(-1, store, note, cardId, barcodeType, headerColor, headerTextColor);
+
+            return new LoyaltyCard(-1, store, note, cardId, barcodeType, headerColor, headerTextColor, 0);
         } catch (NullPointerException | NumberFormatException ex) {
             throw new InvalidObjectException("Not a valid import URI");
         }
@@ -81,7 +87,7 @@ public class ImportURIHelper {
         {
             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

@@ -17,8 +17,10 @@ public class LoyaltyCard
     @Nullable
     public final Integer headerTextColor;
 
+    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 String barcodeType, final Integer headerColor, final Integer headerTextColor,final int starStatus)
     {
         this.id = id;
         this.store = store;
@@ -27,6 +29,7 @@ public class LoyaltyCard
         this.barcodeType = barcodeType;
         this.headerColor = headerColor;
         this.headerTextColor = headerTextColor;
+        this.starStatus = starStatus;
     }
 
     public static LoyaltyCard toLoyaltyCard(Cursor cursor)
@@ -36,6 +39,8 @@ public class LoyaltyCard
         String note = cursor.getString(cursor.getColumnIndexOrThrow(DBHelper.LoyaltyCardDbIds.NOTE));
         String cardId = cursor.getString(cursor.getColumnIndexOrThrow(DBHelper.LoyaltyCardDbIds.CARD_ID));
         String barcodeType = cursor.getString(cursor.getColumnIndexOrThrow(DBHelper.LoyaltyCardDbIds.BARCODE_TYPE));
+        int starred = cursor.getInt(cursor.getColumnIndexOrThrow(DBHelper.LoyaltyCardDbIds.STAR_STATUS));
+
 
         int headerColorColumn = cursor.getColumnIndexOrThrow(DBHelper.LoyaltyCardDbIds.HEADER_COLOR);
         int headerTextColorColumn = cursor.getColumnIndexOrThrow(DBHelper.LoyaltyCardDbIds.HEADER_TEXT_COLOR);
@@ -53,6 +58,6 @@ public class LoyaltyCard
             headerTextColor = cursor.getInt(headerTextColorColumn);
         }
 
-        return new LoyaltyCard(id, store, note, cardId, barcodeType, headerColor, headerTextColor);
+        return new LoyaltyCard(id, store, note, cardId, barcodeType, headerColor, headerTextColor, starred);
     }
 }

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

@@ -2,23 +2,27 @@ package protect.card_locker;
 
 import android.content.Context;
 import android.database.Cursor;
+import android.graphics.Color;
+import android.graphics.PorterDuff;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.CursorAdapter;
 import android.widget.ImageView;
 import android.widget.TextView;
-
 import protect.card_locker.preferences.Settings;
 
 class LoyaltyCardCursorAdapter extends CursorAdapter
 {
     Settings settings;
+    boolean darkModeEnabled;
 
     public LoyaltyCardCursorAdapter(Context context, Cursor cursor)
     {
         super(context, cursor, 0);
         settings = new Settings(context);
+        darkModeEnabled= MainActivity.isDarkModeEnabled(context);
+
     }
 
     // The newView method is used to inflate a new view and return it,
@@ -36,8 +40,14 @@ class LoyaltyCardCursorAdapter extends CursorAdapter
     {
         // Find fields to populate in inflated template
         ImageView thumbnail = view.findViewById(R.id.thumbnail);
-        TextView storeField = (TextView) view.findViewById(R.id.store);
-        TextView noteField = (TextView) view.findViewById(R.id.note);
+        TextView storeField = view.findViewById(R.id.store);
+        TextView noteField = view.findViewById(R.id.note);
+        ImageView star = view.findViewById(R.id.star);
+
+        if(darkModeEnabled)
+        {
+            star.setColorFilter(Color.WHITE, PorterDuff.Mode.SRC_ATOP);
+        }
 
         // Extract properties from cursor
         LoyaltyCard loyaltyCard = LoyaltyCard.toLoyaltyCard(cursor);
@@ -47,7 +57,7 @@ class LoyaltyCardCursorAdapter extends CursorAdapter
 
         storeField.setTextSize(settings.getCardTitleListFontSize());
 
-        if(loyaltyCard.note.isEmpty() == false)
+        if(!loyaltyCard.note.isEmpty())
         {
             noteField.setVisibility(View.VISIBLE);
             noteField.setText(loyaltyCard.note);
@@ -58,6 +68,9 @@ class LoyaltyCardCursorAdapter extends CursorAdapter
             noteField.setVisibility(View.GONE);
         }
 
+        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);
 

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

@@ -405,13 +405,13 @@ public class LoyaltyCardEditActivity extends AppCompatActivity
         }
 
         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);
             Log.i(TAG, "Updated " + loyaltyCardId + " to " + cardId);
         }
         else
         {
-            loyaltyCardId = (int)db.insertLoyaltyCard(store, note, cardId, barcodeType, headingColorValue, headingStoreTextColorValue);
+            loyaltyCardId = (int)db.insertLoyaltyCard(store, note, cardId, barcodeType, headingColorValue, headingStoreTextColorValue, 0);
         }
 
         finish();

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

@@ -56,6 +56,7 @@ public class LoyaltyCardViewActivity extends AppCompatActivity
     String cardIdString;
     BarcodeFormat format;
 
+    boolean starred;
     boolean backgroundNeedsDarkIcons;
     boolean barcodeIsFullscreen = false;
     ViewGroup.LayoutParams barcodeImageState;
@@ -317,11 +318,29 @@ public class LoyaltyCardViewActivity extends AppCompatActivity
             item.setVisible(false);
         }
 
+        loyaltyCard = db.getLoyaltyCard(loyaltyCardId);
+        starred = loyaltyCard.starStatus != 0;
+
         menu.findItem(R.id.action_share).setIcon(getIcon(R.drawable.ic_share_white, backgroundNeedsDarkIcons));
 
         return super.onCreateOptionsMenu(menu);
     }
 
+
+    @Override
+    public boolean onPrepareOptionsMenu(Menu menu) {
+        super.onPrepareOptionsMenu(menu);
+        if (starred) {
+            menu.findItem(R.id.action_star_unstar).setIcon(getIcon(R.drawable.ic_starred_white, backgroundNeedsDarkIcons));
+            menu.findItem(R.id.action_star_unstar).setTitle(R.string.unstar);
+        }
+        else {
+            menu.findItem(R.id.action_star_unstar).setIcon(getIcon(R.drawable.ic_unstarred_white, backgroundNeedsDarkIcons));
+            menu.findItem(R.id.action_star_unstar).setTitle(R.string.star);
+        }
+        return true;
+    }
+
     @Override
     public boolean onOptionsItemSelected(MenuItem item)
     {
@@ -348,11 +367,18 @@ public class LoyaltyCardViewActivity extends AppCompatActivity
                 }
                 rotationEnabled = !rotationEnabled;
                 return true;
+
+            case R.id.action_star_unstar:
+                starred = !starred;
+                db.updateLoyaltyCardStarStatus(loyaltyCardId, starred ? 1 : 0);
+                invalidateOptionsMenu();
+                return true;
         }
 
         return super.onOptionsItemSelected(item);
     }
 
+
     private void setOrientatonLock(MenuItem item, boolean lock)
     {
         if(lock)
@@ -366,7 +392,7 @@ public class LoyaltyCardViewActivity extends AppCompatActivity
         {
             item.setIcon(getIcon(R.drawable.ic_lock_open_white_24dp, backgroundNeedsDarkIcons));
             item.setTitle(R.string.lockScreen);
-            setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_SENSOR);
+            setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_UNSPECIFIED);
         }
     }
 

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

@@ -2,21 +2,15 @@ package protect.card_locker;
 
 import android.app.SearchManager;
 import android.content.ClipData;
+import android.content.ClipboardManager;
 import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
-import android.content.ClipboardManager;
-import android.content.SharedPreferences;
 import android.content.pm.PackageInfo;
 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.app.AppCompatDelegate;
-import androidx.appcompat.widget.SearchView;
-import androidx.appcompat.widget.Toolbar;
 import android.util.Log;
 import android.view.ContextMenu;
 import android.view.Menu;
@@ -28,13 +22,14 @@ 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.common.collect.ImmutableMap;
-
 import java.util.Calendar;
 import java.util.Map;
-
 import protect.card_locker.preferences.SettingsActivity;
 
 public class MainActivity extends AppCompatActivity
@@ -196,23 +191,20 @@ public class MainActivity extends AppCompatActivity
         Cursor cardCursor = (Cursor)listView.getItemAtPosition(info.position);
         LoyaltyCard card = LoyaltyCard.toLoyaltyCard(cardCursor);
 
-        if(card != null)
+        if(item.getItemId() == R.id.action_clipboard)
         {
-            if(item.getItemId() == R.id.action_clipboard)
-            {
-                ClipboardManager clipboard = (ClipboardManager) getSystemService(CLIPBOARD_SERVICE);
-                ClipData clip = ClipData.newPlainText(card.store, card.cardId);
-                clipboard.setPrimaryClip(clip);
+            ClipboardManager clipboard = (ClipboardManager) getSystemService(CLIPBOARD_SERVICE);
+            ClipData clip = ClipData.newPlainText(card.store, card.cardId);
+            clipboard.setPrimaryClip(clip);
 
-                Toast.makeText(this, R.string.copy_to_clipboard_toast, Toast.LENGTH_LONG).show();
-                return true;
-            }
-            else if(item.getItemId() == R.id.action_share)
-            {
-                final ImportURIHelper importURIHelper = new ImportURIHelper(this);
-                importURIHelper.startShareIntent(card);
-                return true;
-            }
+            Toast.makeText(this, R.string.copy_to_clipboard_toast, Toast.LENGTH_LONG).show();
+            return true;
+        }
+        else if(item.getItemId() == R.id.action_share)
+        {
+            final ImportURIHelper importURIHelper = new ImportURIHelper(this);
+            importURIHelper.startShareIntent(card);
+            return true;
         }
 
         return super.onContextItemSelected(item);
@@ -334,9 +326,7 @@ public class MainActivity extends AppCompatActivity
 
         // Set CSS for dark mode if dark mode
         String css = "";
-        Configuration config = getResources().getConfiguration();
-        int currentNightMode = config.uiMode & Configuration.UI_MODE_NIGHT_MASK;
-        if(currentNightMode == Configuration.UI_MODE_NIGHT_YES)
+        if(isDarkModeEnabled(this))
         {
             css = "<style>body {color:white; background-color:black;}</style>";
         }
@@ -382,4 +372,12 @@ public class MainActivity extends AppCompatActivity
             })
             .show();
     }
+
+    protected static boolean isDarkModeEnabled(Context inputContext)
+    {
+        Configuration config = inputContext.getResources().getConfiguration();
+        int currentNightMode = config.uiMode & Configuration.UI_MODE_NIGHT_MASK;
+        return (currentNightMode == Configuration.UI_MODE_NIGHT_YES);
+    }
+
 }

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

@@ -0,0 +1,66 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="192dp"
+    android:height="192dp"
+    android:viewportWidth="50.8"
+    android:viewportHeight="50.8">
+  <path
+      android:pathData="M14.3354,20.1954l20.7318,-9.2304l5.7612,12.9398l-20.7318,9.2304z"
+      android:strokeLineJoin="miter"
+      android:strokeWidth="0.529167"
+      android:fillColor="#f0f0f0"
+      android:strokeColor="#c80000"/>
+  <path
+      android:pathData="M14.8755,10.9648l23.2041,10.3311l-6.8874,15.4694l-23.2041,-10.3311z"
+      android:strokeLineJoin="miter"
+      android:strokeWidth="0.529167"
+      android:fillColor="#f0f0f0"
+      android:strokeColor="#c80000"/>
+  <path
+      android:pathData="M16.5599,16.1348l26.5459,7.6119l-4.5489,15.8639l-26.5459,-7.6119z"
+      android:strokeLineJoin="round"
+      android:strokeWidth="1.5875"
+      android:fillColor="#c80000"
+      android:strokeColor="#c80000"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M12.011,15.4955h27.6157v16.5032h-27.6157z"
+      android:strokeLineJoin="round"
+      android:strokeWidth="1.5875"
+      android:fillColor="#ff0000"
+      android:strokeColor="#ff0000"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M7.8471,23.7471a4.3659,8.5899 0,1 0,8.7317 0a4.3659,8.5899 0,1 0,-8.7317 0z"
+      android:strokeLineJoin="round"
+      android:strokeWidth="0.91078"
+      android:fillColor="#ff0000"
+      android:strokeColor="#ff0000"/>
+  <path
+      android:pathData="m24.4983,25.781a1.6711,1.6711 0,0 1,-1.3809 1.6457,1.6711 1.6711,0 0,1 -1.8605,-1.0741"
+      android:strokeLineJoin="round"
+      android:strokeWidth="0.529167"
+      android:fillColor="#00000000"
+      android:strokeColor="#f0f0f0"
+      android:strokeLineCap="round"/>
+  <path
+      android:pathData="m27.7991,26.333a1.6711,1.6711 0,0 1,-1.8605 1.0741,1.6711 1.6711,0 0,1 -1.3809,-1.6457"
+      android:strokeLineJoin="round"
+      android:strokeWidth="0.529167"
+      android:fillColor="#00000000"
+      android:strokeColor="#f0f0f0"
+      android:strokeLineCap="round"/>
+  <path
+      android:pathData="m16.0606,22.271 l2.6458,-2.6458 2.6458,2.6458"
+      android:strokeLineJoin="miter"
+      android:strokeWidth="0.529167"
+      android:fillColor="#00000000"
+      android:strokeColor="#f0f0f0"
+      android:strokeLineCap="butt"/>
+  <path
+      android:pathData="m27.7023,22.271 l2.6458,-2.6458 2.6458,2.6458"
+      android:strokeLineJoin="miter"
+      android:strokeWidth="0.529167"
+      android:fillColor="#00000000"
+      android:strokeColor="#f0f0f0"
+      android:strokeLineCap="butt"/>
+</vector>

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

@@ -0,0 +1,71 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="108dp"
+    android:height="108dp"
+    android:viewportWidth="108"
+    android:viewportHeight="108">
+  <group android:scaleX="1.5307087"
+      android:scaleY="1.5307087"
+      android:translateX="15.12"
+      android:translateY="15.12">
+    <path
+        android:pathData="M14.3354,20.1954l20.7318,-9.2304l5.7612,12.9398l-20.7318,9.2304z"
+        android:strokeLineJoin="miter"
+        android:strokeWidth="0.529167"
+        android:fillColor="#f0f0f0"
+        android:strokeColor="#c80000"/>
+    <path
+        android:pathData="M14.8755,10.9648l23.2041,10.3311l-6.8874,15.4694l-23.2041,-10.3311z"
+        android:strokeLineJoin="miter"
+        android:strokeWidth="0.529167"
+        android:fillColor="#f0f0f0"
+        android:strokeColor="#c80000"/>
+    <path
+        android:pathData="M16.5599,16.1348l26.5459,7.6119l-4.5489,15.8639l-26.5459,-7.6119z"
+        android:strokeLineJoin="round"
+        android:strokeWidth="1.5875"
+        android:fillColor="#c80000"
+        android:strokeColor="#c80000"
+        android:fillType="evenOdd"/>
+    <path
+        android:pathData="M12.011,15.4955h27.6157v16.5032h-27.6157z"
+        android:strokeLineJoin="round"
+        android:strokeWidth="1.5875"
+        android:fillColor="#ff0000"
+        android:strokeColor="#ff0000"
+        android:fillType="evenOdd"/>
+    <path
+        android:pathData="M7.8471,23.7471a4.3659,8.5899 0,1 0,8.7317 0a4.3659,8.5899 0,1 0,-8.7317 0z"
+        android:strokeLineJoin="round"
+        android:strokeWidth="0.91078"
+        android:fillColor="#ff0000"
+        android:strokeColor="#ff0000"/>
+    <path
+        android:pathData="m24.4983,25.781a1.6711,1.6711 0,0 1,-1.3809 1.6457,1.6711 1.6711,0 0,1 -1.8605,-1.0741"
+        android:strokeLineJoin="round"
+        android:strokeWidth="0.529167"
+        android:fillColor="#00000000"
+        android:strokeColor="#f0f0f0"
+        android:strokeLineCap="round"/>
+    <path
+        android:pathData="m27.7991,26.333a1.6711,1.6711 0,0 1,-1.8605 1.0741,1.6711 1.6711,0 0,1 -1.3809,-1.6457"
+        android:strokeLineJoin="round"
+        android:strokeWidth="0.529167"
+        android:fillColor="#00000000"
+        android:strokeColor="#f0f0f0"
+        android:strokeLineCap="round"/>
+    <path
+        android:pathData="m16.0606,22.271 l2.6458,-2.6458 2.6458,2.6458"
+        android:strokeLineJoin="miter"
+        android:strokeWidth="0.529167"
+        android:fillColor="#00000000"
+        android:strokeColor="#f0f0f0"
+        android:strokeLineCap="butt"/>
+    <path
+        android:pathData="m27.7023,22.271 l2.6458,-2.6458 2.6458,2.6458"
+        android:strokeLineJoin="miter"
+        android:strokeWidth="0.529167"
+        android:fillColor="#00000000"
+        android:strokeColor="#f0f0f0"
+        android:strokeLineCap="butt"/>
+  </group>
+</vector>

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

@@ -52,5 +52,12 @@
             android:ellipsize="end"
             android:textSize="@dimen/noteTextSize"/>
     </LinearLayout>
-
+    <ImageView
+        android:id="@+id/star"
+        android:layout_width="@dimen/cardThumbnailSize"
+        android:layout_height="@dimen/cardThumbnailSize"
+        android:layout_marginLeft="@dimen/activity_margin"
+        android:src="@drawable/ic_starred_white"
+        android:tint="#000000"
+        android:contentDescription="@string/starImage"/>
 </LinearLayout>

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

@@ -12,4 +12,9 @@
         android:icon="@drawable/ic_share_white"
         android:title="@string/share"
         app:showAsAction="always"/>
+    <item
+        android:id="@+id/action_star_unstar"
+        android:icon="@drawable/ic_unstarred_white"
+        android:title="@string/star"
+        app:showAsAction="always" />
 </menu>

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

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@color/ic_launcher_background"/>
+    <foreground android:drawable="@drawable/ic_launcher_foreground"/>
+</adaptive-icon>

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

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@color/ic_launcher_background"/>
+    <foreground android:drawable="@drawable/ic_launcher_foreground"/>
+</adaptive-icon>

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

@@ -47,7 +47,6 @@
     <string name="importOptionApplicationButton">Použít externí aplikaci</string>
 
     <string name="about">O aplikaci</string>
-    <string name="app_copyright_fmt">Copyright 2016-<xliff:g>%d</xliff:g> Branden Archer</string>
     <string name="app_license">Licensed under the GPLv3.</string>
     <string name="about_title_fmt">O aplikaci <xliff:g id="app_name">%s</xliff:g></string>
     <string name="debug_version_fmt">Verze: <xliff:g id="version">%s</xliff:g></string>

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

@@ -1,12 +1,9 @@
-<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">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="storeName">Geschäft</string>
     <string name="note">Notiz</string>
     <string name="cardId">Kartennummer</string>
@@ -20,19 +17,19 @@
     <string name="confirm">Bestätigen</string>
     <string name="lockScreen">Rotation blockieren</string>
     <string name="unlockScreen">Rotation zulassen</string>
+    <string name="star">Zu den Favoriten hinzufügen</string>
+    <string name="unstar">Aus der Favoritenliste entfernen</string>
     <string name="deleteTitle">Karte entfernen</string>
     <string name="deleteConfirmation">Bitte bestätigen Sie, dass diese Karte gelöscht werden soll.</string>
     <string name="ok">Ok</string>
     <string name="copy_to_clipboard">Kopiere die Nummer in die Zwischenablage</string>
-    <string name="sendLabel">Senden&#8230;</string>
+    <string name="sendLabel">Senden…</string>
     <string name="editCardTitle">Kundenkarte bearbeiten</string>
     <string name="addCardTitle">Neue Kundenkarte</string>
-    <string name="scanCardBarcode">Barcode scannen</string>
+    <string name="scanCardBarcode">Strichcode scannen</string>
     <string name="cardShortcut">Shortcut zu einer Karte</string>
     <string name="noCardsMessage">Es ist noch keine Karte vorhanden, bitte zuerst eine hinzufügen</string>
-
-    <string name="barcodeImageDescription">Bild des Barcodes</string>
-
+    <string name="barcodeImageDescription">Bild des Strichcodes</string>
     <string name="noStoreError">Kein Geschäft angegeben</string>
     <string name="noCardIdError">Keine Kartennummer angegeben</string>
     <string name="noCardExistsError">Karte konnte nicht gefunden werden</string>
@@ -48,34 +45,28 @@
     <string name="exportFailed">Export fehlgeschlagen</string>
     <string name="importing">Importiere…</string>
     <string name="exporting">Exportiere…</string>
-    <string name="noExternalStoragePermissionError">Ohne die Berechtigung für den externen Speicher kann kein Import oder Export erfolgen.</string>
+    <string name="noExternalStoragePermissionError">Ohne die Berechtigung für den externen Speicher kann kein Import oder Export erfolgen</string>
     <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="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>
-    <string name="app_copyright_fmt">Copyright 2016-<xliff:g>%d</xliff:g> Branden Archer</string>
     <string name="app_license">Lizensiert unter der GPLv3.</string>
     <string name="about_title_fmt">Über <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">Informationen zu dieser Version: <xliff:g id="app_revision_url">%s</xliff:g></string>
     <string name="app_libraries"><xliff:g id="app_name">%s</xliff:g> benutzt die folgenden Fremdbibliotheken: <xliff:g id="app_libraries_list">%s</xliff:g></string>
     <string name="app_resources"><xliff:g id="app_name">%s</xliff:g> verwendet folgenden Dritt-Ressourcen: <xliff:g id="app_resources_list">%s</xliff:g></string>
-
-    <string name="selectBarcodeTitle">Barcode auswählen</string>
+    <string name="selectBarcodeTitle">Strichcode auswählen</string>
     <string name="copy_to_clipboard_toast">Nummer in die Zwischenablage kopiert</string>
-
     <string name="thumbnailDescription">Vorschaubild für die Karte</string>
-
     <string name="change">Anpassen</string>
     <string name="storeTextColorTitle">Textfarbe</string>
     <string name="storeTextBackgroundColorTitle">Hintergrundfarbe</string>
     <string name="storeNameBackgroundColorDescription">Hintergrundfarbe für den Geschäftsnamen</string>
     <string name="storeNameColorDescription">Farbe für den Geschäftsnamen</string>
-
     <string name="settings">Einstellungen</string>
     <string name="settings_category_title_ui">Benutzeroberfläche</string>
     <string name="settings_card_title_list_font_size">Schriftgröße des Titels in der Listenansicht</string>
@@ -83,6 +74,21 @@
     <string name="settings_card_title_font_size">Schriftgröße des Titels</string>
     <string name="settings_card_id_font_size">Schriftgröße der Kartennummer</string>
     <string name="settings_card_note_font_size">Schriftgröße der Notiz</string>
-    <string name="settings_display_barcode_max_brightness">Helligkeit bei Barcode Ansicht erhöhen</string>
-    <string name="settings_lock_barcode_orientation">Barcodeausrichtung sperren</string>
-    </resources>
+    <string name="settings_display_barcode_max_brightness">Helligkeit bei Strichcode Ansicht erhöhen</string>
+    <string name="settings_lock_barcode_orientation">Strichcodeausrichtung sperren</string>
+    <string name="exportSuccessful">Kundenkartendaten erflogreich exportiert</string>
+    <string name="importSuccessful">Kundenkartendaten erflogreich importiert</string>
+    <string name="intent_import_card_from_url_share_text">Ich will eine Karte mit Ihnen teilen</string>
+    <string name="settings_dark_theme">Dunkel</string>
+    <string name="settings_light_theme">Hell</string>
+    <string name="settings_system_theme">Systemvorgabe</string>
+    <string name="settings_theme">Design</string>
+    <string name="enterBarcodeInstructions">Geben Sie die Karten-ID ein und wählen Sie das Bild aus, das den Strichcode darstellt, den Sie verwenden möchten, oder wählen Sie „Diese Karte hat keinen Strichcode“, um keinen Strichcode zu verwenden.</string>
+    <string name="app_copyright_old">Basiert auf Loyalty Card Keychain, Copyright 2016-2020 Branden Archer.</string>
+    <string name="exportOptionExplanation">Die Daten werden an einen Ort Ihrer Wahl geschrieben.</string>
+    <string name="failedParsingImportUriError">Der Import-URI konnte nicht analysiert werden</string>
+    <string name="addedShortcut">Verknüpfung hinzugefügt</string>
+    <string name="share">Teilen</string>
+    <string name="barcodeNoBarcode">Diese Karte hat keinen Strichcode</string>
+    <string name="barcodeType">Strichcode-Typ</string>
+</resources>

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

@@ -54,7 +54,6 @@
     <string name="importOptionApplicationButton">Χρήση εξωτερικής εφαρμογής</string>
 
     <string name="about">Σχετικά</string>
-    <string name="app_copyright_fmt">Copyright 2016-<xliff:g>%d</xliff:g> Branden Archer</string>
     <string name="app_license">Άδεια χρήσης υπό το GPLv3.</string>
     <string name="about_title_fmt">Σχετικά με <xliff:g id="app_name">%s</xliff:g></string>
     <string name="debug_version_fmt">Έκδοση: <xliff:g id="version">%s</xliff:g></string>

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

@@ -1,83 +1,88 @@
-<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_add">Añadir</string>
-
-    <string name="noGiftCards">Actualmente no tienes ninguna tarjeta guardada. Presiona el botón \"+\" para comenzar.\n\nEsta cartera te permite llevar tus tarjetas de fidelización en tu teléfono para que estén siempre a tu alcance.</string>
+    <string name="noGiftCards">Actualmente no tiene ninguna tarjeta guardada. Pulse el botón «+» para comenzar.
+\n
+\nCatima le permite llevar sus tarjetas en el teléfono para que estén siempre a su alcance.</string>
     <string name="storeName">Tienda</string>
     <string name="note">Nota</string>
-    <string name="cardId">ID de la Tarjeta</string>
+    <string name="cardId">Id. de tarjeta</string>
     <string name="cancel">Cancelar</string>
     <string name="save">Guardar</string>
-    <string name="capture">Escanear Tarjeta</string>
-    <string name="enterCard">Introducir Tarjeta</string>
-    <string name="editCard">Editar Tarjeta</string>
+    <string name="capture">Capturar tarjeta</string>
+    <string name="enterCard">Introducir tarjeta</string>
+    <string name="editCard">Editar tarjeta</string>
     <string name="edit">Editar</string>
     <string name="delete">Eliminar</string>
     <string name="confirm">Confirmar</string>
-    <string name="lockScreen">Bloquear Rotación de Pantalla</string>
-    <string name="unlockScreen">Rotación de Pantalla Automática</string>
-    <string name="deleteTitle">Eliminar Tarjeta de Fidelización</string>
-    <string name="deleteConfirmation">Por favor, confirma si quieres eliminar esta tarjeta.</string>
-    <string name="ok">OK</string>
-    <string name="copy_to_clipboard">Copiar ID al portapapeles</string>
-    <string name="sendLabel">Enviar&#8230;</string>
-    <string name="editCardTitle">Editar Tarjeta de Fidelización</string>
-    <string name="addCardTitle">Añadir Tarjeta de Fidelización</string>
-    <string name="scanCardBarcode">Escanear el Código de Barras de la Tarjeta</string>
-    <string name="cardShortcut">Atajo de Tarjeta</string>
-    <string name="noCardsMessage">No hay ninguna tarjeta, añade una primero</string>
-
+    <string name="lockScreen">Bloquear rotación</string>
+    <string name="unlockScreen">Desbloquear rotación</string>
+    <string name="deleteTitle">Eliminar tarjeta</string>
+    <string name="deleteConfirmation">Confirme que quiere eliminar esta tarjeta.</string>
+    <string name="ok">Aceptar</string>
+    <string name="copy_to_clipboard">Copiar id. en portapapeles</string>
+    <string name="sendLabel">Enviar…</string>
+    <string name="editCardTitle">Editar tarjeta</string>
+    <string name="addCardTitle">Añadir tarjeta</string>
+    <string name="scanCardBarcode">Escanear código de barras de la tarjeta</string>
+    <string name="cardShortcut">Atajo de tarjeta</string>
+    <string name="noCardsMessage">No hay ninguna tarjeta; añada una primero</string>
     <string name="barcodeImageDescription">Imagen del código de barras de la tarjeta</string>
-
     <string name="noStoreError">Establecimiento no especificado</string>
-    <string name="noCardIdError">ID de la Tarjeta no especificado</string>
+    <string name="noCardIdError">Id. de tarjeta no especificado</string>
     <string name="noCardExistsError">No se ha podido encontrar la tarjeta de fidelización</string>
     <string name="cardIdFormat">%1$s: %2$s</string>
-    <string name="importExport">Importar/Exportar</string>
+    <string name="importExport">Importar/exportar</string>
     <string name="exportName">Exportar</string>
-    <string name="importExportHelp">La copia de seguridad te permite transferir tus tarjetas a otro dispositivo.</string>
+    <string name="importExportHelp">La copia de respaldo le permite transferir sus tarjetas a otro dispositivo.</string>
     <string name="importSuccessfulTitle">Datos importados correctamente</string>
-    <string name="importFailedTitle">Ha ocurrido un error al importar los datos</string>
-    <string name="importFailed">Error al importar</string>
+    <string name="importFailedTitle">Falló la importación</string>
+    <string name="importFailed">No se pudo importar</string>
     <string name="exportSuccessfulTitle">Datos exportados correctamente</string>
-    <string name="exportFailedTitle">Ha ocurrido un error al exportar los datos</string>
-    <string name="exportFailed">Error al exportar</string>
-    <string name="importing">Importando&#8230;</string>
-    <string name="exporting">Exportando&#8230;</string>
+    <string name="exportFailedTitle">Falló la exportación</string>
+    <string name="exportFailed">No se pudo exportar</string>
+    <string name="importing">Importando…</string>
+    <string name="exporting">Exportando…</string>
     <string name="noExternalStoragePermissionError">No se pueden importar o exportar tarjetas sin el permiso de almacenamiento</string>
     <string name="importOptionFilesystemTitle">Importar desde el sistema de archivos</string>
-    <string name="importOptionFilesystemExplanation">Seleccionar un archivo del sistema de archivos</string>
+    <string name="importOptionFilesystemExplanation">Elegir un archivo concreto del sistema de archivos.</string>
     <string name="importOptionFilesystemButton">Desde el sistema de archivos</string>
-    <string name="importOptionApplicationTitle">Usar una applicación externa</string>
+    <string name="importOptionApplicationTitle">Utilizar aplicación externa</string>
     <string name="importOptionApplicationExplanation">Use una aplicación externa como Dropbox, Google Drive o tu gestor de archivos favoritos para abrir un archivo.</string>
-    <string name="importOptionApplicationButton">Usar aplicación externa</string>
-
+    <string name="importOptionApplicationButton">Utilizar aplicación externa</string>
     <string name="about">Acerca de</string>
-    <string name="app_copyright_fmt">Copyright 2016-<xliff:g>%d</xliff:g> Branden Archer</string>
-    <string name="app_license">Licencia GPLv3</string>
+    <string name="app_license">Disponible en virtud de la GPLv3.</string>
     <string name="about_title_fmt">Acerca de <xliff:g id="app_name">%s</xliff:g></string>
     <string name="debug_version_fmt">Versión: <xliff:g id="version">%s</xliff:g></string>
-    <string name="app_revision_fmt">Información sobre la Revisión: <xliff:g id="app_revision_url">%s</xliff:g></string>
-    <string name="app_libraries"><xliff:g id="app_name">%s</xliff:g> utiliza las siguientes librerías de terceros: <xliff:g id="app_libraries_list">%s</xliff:g></string>
-    <string name="app_resources"><xliff:g id="app_name">%s</xliff:g> utiliza los siguientes recursos de terceros: <xliff:g id="app_resources_list">%s</xliff:g></string>
-
-    <string name="selectBarcodeTitle">Selecciona el Código de Barras</string>
-    <string name="copy_to_clipboard_toast">ID de la Tarjeta copiado al portapapeles</string>
-
-    <string name="thumbnailDescription">Miniatura para la tarjeta</string>
-
     <string name="change">Cambiar</string>
-    <string name="storeTextColorTitle">Color del Texto de la Tienda</string>
-    <string name="storeTextBackgroundColorTitle">Color Principal</string>
+    <string name="storeTextColorTitle">Color de texto de establecimiento</string>
+    <string name="storeTextBackgroundColorTitle">Color principal</string>
     <string name="storeNameBackgroundColorDescription">Color de fondo para el texto de la tienda</string>
     <string name="storeNameColorDescription">Color del texto de la tienda</string>
-
     <string name="settings">Configuración</string>
-    <string name="settings_category_title_ui">Interfaz de Usuario</string>
+    <string name="settings_category_title_ui">Interfaz de usuario</string>
     <string name="settings_card_title_list_font_size">Tamaño de la letra para el título (lista)</string>
     <string name="settings_card_note_list_font_size">Tamaño de la letra para notas (lista)</string>
     <string name="settings_card_title_font_size">Tamaño de la letra para el título</string>
     <string name="settings_card_id_font_size">Tamaño de la letra para el ID de la tarjeta</string>
     <string name="settings_card_note_font_size">Tamaño de la letra para notas</string>
-    </resources>
+    <string name="settings_display_barcode_max_brightness">Iluminar vista de código de barras</string>
+    <string name="exportSuccessful">Se exportaron correctamente los datos de tarjetas de fidelización</string>
+    <string name="importSuccessful">Se importaron correctamente los datos de tarjetas de fidelización</string>
+    <string name="intent_import_card_from_url_share_text">Quiero compartirle una tarjeta</string>
+    <string name="settings_lock_barcode_orientation">Bloquear orientación de código de barras</string>
+    <string name="settings_dark_theme">Tema oscuro</string>
+    <string name="settings_light_theme">Tema claro</string>
+    <string name="settings_system_theme">Tema del sistema</string>
+    <string name="settings_theme">Tema</string>
+    <string name="enterBarcodeInstructions">Introduzca el identificador de tarjeta y seleccione la imagen que represente el código de barras que se utilizará, o bien, elija «Esta tarjeta no tiene código de barras» para no utilizar ninguno.</string>
+    <string name="app_copyright_old">Basado en Loyalty Card Keychain, derechos de autor 2016-2020 de Branden Archer.</string>
+    <string name="exportOptionExplanation">Los datos se guardarán en la ubicación que elija.</string>
+    <string name="failedParsingImportUriError">No se pudo procesar el URI de importación</string>
+    <string name="addedShortcut">Atajo añadido</string>
+    <string name="share">Compartir</string>
+    <string name="barcodeNoBarcode">Esta tarjeta no tiene código de barras</string>
+    <string name="barcodeType">Tipo de código de barras</string>
+    <string name="noMatchingGiftCards">Ninguna tarjeta coincide con el filtro de búsqueda. Pruebe con términos distintos.</string>
+    <string name="action_search">Buscar</string>
+</resources>

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

@@ -1,8 +1,6 @@
-<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_add">Ajouter</string>
-
     <string name="noGiftCards">Aucune carte de fidélité enregistrée. Appuyez sur le bouton \"+\" (plus) pour commencer.\n\nLoyalty Card Locker vous permet d\'enregistrer vos cartes de fidélité sur votre téléphone pour toujours les avoir à portée de main.</string>
     <string name="storeName">Nom</string>
     <string name="note">Note</string>
@@ -18,18 +16,16 @@
     <string name="lockScreen">Désactiver la rotation</string>
     <string name="unlockScreen">Activer la rotation</string>
     <string name="deleteTitle">Supprimer la carte de fidélité</string>
-    <string name="deleteConfirmation">Confirmez que vous souhaitez supprimer cette carte</string>
+    <string name="deleteConfirmation">Confirmez que vous souhaitez supprimer cette carte.</string>
     <string name="ok">OK</string>
     <string name="copy_to_clipboard">Copier le numéro dans le presse-papier</string>
-    <string name="sendLabel">Envoyer&#8230;</string>
+    <string name="sendLabel">Envoyer…</string>
     <string name="editCardTitle">Modifier la carte de fidélité</string>
     <string name="addCardTitle">Ajouter une carte de fidélité</string>
-    <string name="scanCardBarcode">Flasher le code-barres de la carte</string>
+    <string name="scanCardBarcode">Scanner le code-barres</string>
     <string name="cardShortcut">Raccourci de carte</string>
-    <string name="noCardsMessage">Il n\'y a aucune carte. Ajoutez en une d\'abord.</string>
-
+    <string name="noCardsMessage">Il n\'y a aucune carte. Ajoutez-en une d\'abord</string>
     <string name="barcodeImageDescription">Image du code-barres de la carte</string>
-
     <string name="noStoreError">Aucun nom n\'a été saisi</string>
     <string name="noCardIdError">Aucun numéro n\'a été saisi</string>
     <string name="noCardExistsError">N\'a pas pu retrouver la carte de fidélité</string>
@@ -43,38 +39,32 @@
     <string name="exportSuccessfulTitle">Exporté avec succès</string>
     <string name="exportFailedTitle">Échec de l\'export</string>
     <string name="exportFailed">Échec de l\'export </string>
-    <string name="importing">Import &#8230;</string>
-    <string name="exporting">Export &#8230;</string>
+    <string name="importing">Import …</string>
+    <string name="exporting">Export …</string>
     <string name="noExternalStoragePermissionError">Impossible d\'importer ou d\'exporter les données sans l\'autorisation d\'accès au stockage externe</string>
-    <string name="importOptionFilesystemTitle">Importer depuis le système de fichiers.</string>
+    <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="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>
-    <string name="app_copyright_fmt">Copyright 2016-<xliff:g>%d</xliff:g> Branden Archer</string>
     <string name="app_license">Licence GPLv3.</string>
     <string name="about_title_fmt">À propos de <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">Notes sur les versions : <xliff:g id="app_revision_url">%s</xliff:g></string>
     <string name="app_libraries"><xliff:g id="app_name">%s</xliff:g> utilise les bibliothèques-tierces suivantes : <xliff:g id="app_libraries_list">%s</xliff:g></string>
     <string name="app_resources"><xliff:g id="app_name">%s</xliff:g> utilise les ressources-tierces suivantes : <xliff:g id="app_resources_list">%s</xliff:g></string>
-
-    <string name="selectBarcodeTitle">Choisissez le code-barre</string>
+    <string name="selectBarcodeTitle">Choisissez le code-barres</string>
     <string name="copy_to_clipboard_toast">Numéro de carte copié dans le presse-papier</string>
-
     <string name="thumbnailDescription">Miniature pour la carte</string>
-
     <string name="change">Modifier</string>
     <string name="storeTextColorTitle">Couleur du texte du magasin</string>
     <string name="storeTextBackgroundColorTitle">Couleur du titre</string>
     <string name="storeNameBackgroundColorDescription">Couleur de fond du texte du magasin</string>
     <string name="storeNameColorDescription">Couleur pour le nom du magasin</string>
-
     <string name="settings">Paramètres</string>
-    <string name="settings_category_title_ui">Interface</string>
+    <string name="settings_category_title_ui">Interface utilisateur</string>
     <string name="settings_card_title_list_font_size">Taille de police pour les titres de carte en liste</string>
     <string name="settings_card_note_list_font_size">Taille de police pour les notes de carte en liste</string>
     <string name="settings_card_title_font_size">Taille de police pour les titres de carte</string>
@@ -82,4 +72,21 @@
     <string name="settings_card_note_font_size">Taille de police pour les notes de carte</string>
     <string name="settings_display_barcode_max_brightness">Augmenter la luminosité du code-barres</string>
     <string name="settings_lock_barcode_orientation">Verrouiller l\'orientation du code-barres</string>
-    </resources>
+    <string name="exportSuccessful">Carte de fidélité exportée avec succès</string>
+    <string name="importSuccessful">Carte de fidélité importée avec succès</string>
+    <string name="intent_import_card_from_url_share_text">Je veux partager une carte avec toi</string>
+    <string name="settings_dark_theme">Thème sombre</string>
+    <string name="settings_light_theme">Thème clair</string>
+    <string name="settings_system_theme">Thème du système</string>
+    <string name="settings_theme">Thème</string>
+    <string name="enterBarcodeInstructions">Entrez l\'identifiant de la carte puis sélectionnez l\'image qui représente le code-barres que vous souhaitez utiliser, ou sélectionnez « Cette carte n\'a pas de code-barres » pour ne pas utiliser de code-barres.</string>
+    <string name="app_copyright_old">Basé sur Loyalty Card Keychain, copyright 2016-2020 Branden Archer.</string>
+    <string name="exportOptionExplanation">Les données seront écrites à un emplacement de votre choix.</string>
+    <string name="failedParsingImportUriError">Impossible d\'analyser l\'URI d\'importation</string>
+    <string name="addedShortcut">Raccourci ajouté</string>
+    <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="action_search">Rechercher</string>
+</resources>

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

@@ -1,17 +1,13 @@
-<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">Cerca</string>
     <string name="action_add">Aggiungi</string>
-
     <string name="noGiftCards">Non hai ancora alcuna carta fedeltà. Premi sul bottone +(più) in alto per incominciare.\n\nL\'app ti permette di portare con te le tue carte fedeltà, così da averle sempre a disposizione.</string>
-    <string name="noMatchingGiftCards">Nessuna carta fedeltà corrisponde al filtro. Riprovare con altri valori</string>
-
+    <string name="noMatchingGiftCards">Nessuna carta fedeltà corrisponde al filtro. Riprovare con altri valori.</string>
     <string name="storeName">Negozio</string>
     <string name="note">Note</string>
     <string name="cardId">Codice</string>
     <string name="barcodeNoBarcode">Questa carta non ha un codice a barre</string>
-
     <string name="cancel">Annulla</string>
     <string name="save">Salva</string>
     <string name="capture">Scansione carta</string>
@@ -27,15 +23,13 @@
     <string name="ok">Ok</string>
     <string name="copy_to_clipboard">Copia ID negli appunti</string>
     <string name="share">Condividi</string>
-    <string name="sendLabel">Invia&#8230;</string>
+    <string name="sendLabel">Invia…</string>
     <string name="editCardTitle">Modifica carta</string>
     <string name="addCardTitle">Aggiungi carta</string>
     <string name="scanCardBarcode">Scansiona codice carta</string>
     <string name="cardShortcut">Scorciatoia per la carta</string>
     <string name="noCardsMessage">Non ci sono carte. Aggiungine prima una</string>
-
     <string name="barcodeImageDescription">Immagine del codice a barre della carta</string>
-
     <string name="noStoreError">Nessun negozio inserito</string>
     <string name="noCardIdError">Nessun codice carta inserito</string>
     <string name="noCardExistsError">Impossibile trovare la carta</string>
@@ -50,38 +44,31 @@
     <string name="exportSuccessfulTitle">Esportazione avvenuta con successo</string>
     <string name="exportFailedTitle">Esportazione fallita</string>
     <string name="exportFailed">Impossibile esportare</string>
-    <string name="importing">Importazione in corso&#8230;</string>
-    <string name="exporting">Esportazione in corso&#8230;</string>
-    <string name="noExternalStoragePermissionError">Impossibile importare o esportare i dati senza il permesso per l\'uso della memoria esterna.</string>
+    <string name="importing">Importazione in corso…</string>
+    <string name="exporting">Esportazione in corso…</string>
+    <string name="noExternalStoragePermissionError">Impossibile importare o esportare i dati senza il permesso per l\'uso della memoria esterna</string>
     <string name="importOptionFilesystemTitle">Importa dal file system</string>
     <string name="importOptionFilesystemExplanation">Scegli un file dal file system.</string>
     <string name="importOptionFilesystemButton">Dal file system</string>
     <string name="importOptionApplicationTitle">Usa un\'applicazione esterna</string>
     <string name="importOptionApplicationExplanation">Usa un\'applicazione esterna come Dropbox, Google Drive o il tuo file manager preferito per aprire il file.</string>
     <string name="importOptionApplicationButton">Usa un\'applicazione esterna</string>
-
     <string name="about">Informazioni</string>
-    <string name="app_copyright_fmt">Copyright 2016-<xliff:g>%d</xliff:g> Branden Archer</string>
     <string name="app_license">Pubblicato sotto licenza GPLv3.</string>
     <string name="about_title_fmt">Informazioni su <xliff:g id="app_name">%s</xliff:g></string>
     <string name="debug_version_fmt">Versione: <xliff:g id="version">%s</xliff:g></string>
     <string name="app_revision_fmt">Informazione sulla versione: <xliff:g id="app_revision_url">%s</xliff:g></string>
     <string name="app_libraries"><xliff:g id="app_name">%s</xliff:g> usa le seguenti librerie di terze parti: <xliff:g id="app_libraries_list">%s</xliff:g></string>
     <string name="app_resources"><xliff:g id="app_name">%s</xliff:g> usa le seguenti risorse di terze parti: <xliff:g id="app_resources_list">%s</xliff:g></string>
-
     <string name="selectBarcodeTitle">Seleziona codice a barre</string>
-    <string name="enterBarcodeInstructions">Immettere l\'ID della carta, quindi selezionare l\'immagine che rappresenta il codice a barre desiderato oppure selezionare &#8220;Questa carta non ha un codice a barre&#8221; per non valorizzare il dato.</string>
-
+    <string name="enterBarcodeInstructions">Immettere l\'ID della carta, quindi selezionare l\'immagine che rappresenta il codice a barre desiderato oppure selezionare «Questa carta non ha un codice a barre» per non valorizzare il dato.</string>
     <string name="copy_to_clipboard_toast">ID della carta copiato negli appunti</string>
-
     <string name="thumbnailDescription">Miniatura carta</string>
-
     <string name="change">Cambia</string>
     <string name="storeTextColorTitle">Colore titolo</string>
     <string name="storeTextBackgroundColorTitle">Colore scheda</string>
     <string name="storeNameBackgroundColorDescription">Colore di sfondo del titolo carta</string>
     <string name="storeNameColorDescription">Colore del titolo carta</string>
-
     <string name="settings">Impostazioni</string>
     <string name="settings_category_title_ui">Interfaccia utente</string>
     <string name="settings_theme">Tema</string>
@@ -96,4 +83,10 @@
     <string name="settings_display_barcode_max_brightness">Aumenta luminosità dello schermo quando apro un codice a barre</string>
     <string name="settings_lock_barcode_orientation">Blocca orientamento del codice a barre</string>
     <string name="intent_import_card_from_url_share_text">Voglio condividere una carta fedeltà con te</string>
-    </resources>
+    <string name="exportSuccessful">Dati della carta fedeltà esportati correttamente</string>
+    <string name="importSuccessful">Dati della carta fedeltà importati correttamente</string>
+    <string name="app_copyright_old">Basato su Loyalty Card Keychain, copyright 2016-2020 Branden Archer.</string>
+    <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>

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

@@ -34,7 +34,6 @@
     <string name="exporting">Eksportuoja&#8230;</string>
     <string name="noExternalStoragePermissionError">Negalima importuoti/eksportuoti kortelių be išorinės atminties leidimo</string>
     <string name="about">Apie</string>
-    <string name="app_copyright_fmt">Visos teisės saugomos 2016-<xliff:g>%d</xliff:g> Branden Archer</string>
     <string name="app_license">Licenzijuota pagal GPLv3.</string>
     <string name="about_title_fmt">Apie <xliff:g id="app_name">%s</xliff:g></string>
     <string name="debug_version_fmt">Versija: <xliff:g id="version">%s</xliff:g></string>

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

@@ -52,7 +52,6 @@
     <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>
-    <string name="app_copyright_fmt">Kopirett 2016-<xliff:g>%d</xliff:g> Branden Archer</string>
     <string name="app_license">Lisensiert GPLv3+.</string>
     <string name="about_title_fmt">Om <xliff:g id="app_name">%s</xliff:g>
     </string>
@@ -83,4 +82,17 @@
     <string name="settings_card_note_font_size">Skriftstørrelse for kortmerknad</string>
     <string name="settings_display_barcode_max_brightness">Lysere strekkodevisning</string>
     <string name="settings_lock_barcode_orientation">Lås strekkodesideretning</string>
-</resources>
+    <string name="exportSuccessful">Eksporterte stamkundekortdata</string>
+    <string name="importSuccessful">Importerte stamkundekortdata</string>
+    <string name="intent_import_card_from_url_share_text">Jeg ønsker å dele et kort med deg</string>
+    <string name="settings_dark_theme">Mørk</string>
+    <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="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>
+</resources>

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

@@ -64,7 +64,6 @@
     <string name="importOptionApplicationButton">Externe app gebruiken</string>
 
     <string name="about">Over</string>
-    <string name="app_copyright_fmt">Copyright 2016-<xliff:g>%d</xliff:g> Branden Archer</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>
     <string name="debug_version_fmt">Versie: <xliff:g id="version">%s</xliff:g></string>

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

@@ -61,7 +61,6 @@
     <string name="importOptionApplicationButton">Użyj zewnętrznej aplikacji</string>
 
     <string name="about">O aplikacji</string>
-    <string name="app_copyright_fmt">© 2016 — <xliff:g>%d</xliff:g> Branden Archer.</string>
     <string name="app_license">Licencjonowane na podstawie GNU General Public License, wersji 3.0.</string>
     <string name="about_title_fmt">O <xliff:g id="app_name">%s</xliff:g></string>
     <string name="debug_version_fmt">Wersja: <xliff:g id="version">%s</xliff:g></string>

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

@@ -64,7 +64,6 @@
     <string name="importOptionApplicationButton">Использовать другое приложение</string>
 
     <string name="about">О программе</string>
-    <string name="app_copyright_fmt">Все права защищены 2016-<xliff:g>%d</xliff:g> Branden Archer</string>
     <string name="app_license">Лицензия GPLv3.</string>
     <string name="about_title_fmt">О программе <xliff:g id="app_name">%s</xliff:g></string>
     <string name="debug_version_fmt">Версия: <xliff:g id="version">%s</xliff:g></string>

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

@@ -54,7 +54,6 @@
     <string name="importOptionApplicationButton">Použiť externú aplikáciu</string>
 
     <string name="about">O aplikácii</string>
-    <string name="app_copyright_fmt">Copyright 2016-<xliff:g>%d</xliff:g> Branden Archer</string>
     <string name="app_license">Licencované GPLv3.</string>
     <string name="about_title_fmt">O <xliff:g id="app_name">%s</xliff:g></string>
     <string name="debug_version_fmt">Verzia: <xliff:g id="version">%s</xliff:g></string>

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

@@ -54,7 +54,6 @@
     <string name="importOptionApplicationButton">Uporabi zunanjo aplikacijo</string>
 
     <string name="about">Več o aplikaciji</string>
-    <string name="app_copyright_fmt">Copyright 2016-<xliff:g>%d</xliff:g> Branden Archer</string>
     <string name="app_license">Licencirano s skladu z GPLv3.</string>
     <string name="about_title_fmt">Več o <xliff:g id="app_name">%s</xliff:g></string>
     <string name="debug_version_fmt">Verzija: <xliff:g id="version">%s</xliff:g></string>

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

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="ic_launcher_background">#223355</color>
+</resources>

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

@@ -14,6 +14,9 @@
     <string name="barcodeType">Barcode type</string>
     <string name="barcodeNoBarcode">This card has no barcode</string>
 
+    <string name="star">Add to favorites</string>
+    <string name="unstar">Remove from favorites</string>
+
     <string name="cancel">Cancel</string>
     <string name="save">Save</string>
     <string name="capture">Capture Card</string>
@@ -65,7 +68,7 @@
     <string name="importOptionApplicationButton">Use external application</string>
 
     <string name="about">About</string>
-    <string name="app_copyright_fmt">Copyright 2019-<xliff:g>%d</xliff:g> Sylvia van Os.</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="about_title_fmt">About <xliff:g id="app_name">%s</xliff:g></string>
@@ -80,6 +83,7 @@
     <string name="copy_to_clipboard_toast">Card ID copied to clipboard</string>
 
     <string name="thumbnailDescription">Thumbnail for card</string>
+    <string name="starImage">Favorite star</string>
 
     <string name="change">Change</string>
     <string name="storeTextColorTitle">Store Text Color</string>

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

@@ -40,7 +40,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);
+        long id = db.insertLoyaltyCard("store", "note", "cardId", BarcodeFormat.UPC_A.toString(), DEFAULT_HEADER_COLOR, DEFAULT_HEADER_TEXT_COLOR, 0);
         boolean result = (id != -1);
         assertTrue(result);
         assertEquals(1, db.getLoyaltyCardCount());
@@ -50,6 +50,7 @@ public class DatabaseTest
         assertEquals("store", loyaltyCard.store);
         assertEquals("note", loyaltyCard.note);
         assertEquals("cardId", loyaltyCard.cardId);
+        assertEquals(0, loyaltyCard.starStatus);
         assertEquals(BarcodeFormat.UPC_A.toString(), loyaltyCard.barcodeType);
 
         result = db.deleteLoyaltyCard(1);
@@ -61,7 +62,7 @@ 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);
+        long id = db.insertLoyaltyCard("store", "note", "cardId", BarcodeFormat.UPC_A.toString(), DEFAULT_HEADER_COLOR, DEFAULT_HEADER_TEXT_COLOR,0);
         boolean result = (id != -1);
         assertTrue(result);
         assertEquals(1, db.getLoyaltyCardCount());
@@ -75,9 +76,33 @@ public class DatabaseTest
         assertEquals("store1", loyaltyCard.store);
         assertEquals("note1", loyaltyCard.note);
         assertEquals("cardId1", loyaltyCard.cardId);
+        assertEquals(0, loyaltyCard.starStatus);
         assertEquals(BarcodeFormat.AZTEC.toString(), loyaltyCard.barcodeType);
     }
 
+    @Test
+    public void updateGiftCardOnlyStar()
+    {
+        long id = db.insertLoyaltyCard("store", "note", "cardId", BarcodeFormat.UPC_A.toString(), DEFAULT_HEADER_COLOR, DEFAULT_HEADER_TEXT_COLOR,0);
+        boolean result = (id != -1);
+        assertTrue(result);
+        assertEquals(1, db.getLoyaltyCardCount());
+
+        result = db.updateLoyaltyCardStarStatus(1, 1);
+        assertTrue(result);
+        assertEquals(1, db.getLoyaltyCardCount());
+
+        LoyaltyCard loyaltyCard = db.getLoyaltyCard(1);
+        assertNotNull(loyaltyCard);
+        assertEquals("store", loyaltyCard.store);
+        assertEquals("note", loyaltyCard.note);
+        assertEquals("cardId", loyaltyCard.cardId);
+        assertEquals(1, loyaltyCard.starStatus);
+        assertEquals(BarcodeFormat.UPC_A.toString(), loyaltyCard.barcodeType);
+    }
+
+
+
     @Test
     public void updateMissingGiftCard()
     {
@@ -92,7 +117,7 @@ public class DatabaseTest
     @Test
     public void emptyGiftCardValues()
     {
-        long id = db.insertLoyaltyCard("", "", "", "", null, null);
+        long id = db.insertLoyaltyCard("", "", "", "", null, null, 0);
         boolean result = (id != -1);
         assertTrue(result);
         assertEquals(1, db.getLoyaltyCardCount());
@@ -115,7 +140,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);
+                    BarcodeFormat.UPC_A.toString(), index, index*2, 0);
             boolean result = (id != -1);
             assertTrue(result);
         }
@@ -136,6 +161,66 @@ public class DatabaseTest
             assertEquals("cardId"+index, cursor.getString(cursor.getColumnIndexOrThrow(DBHelper.LoyaltyCardDbIds.CARD_ID)));
             assertEquals("cardId"+index, cursor.getString(cursor.getColumnIndexOrThrow(DBHelper.LoyaltyCardDbIds.CARD_ID)));
             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();
+        }
+
+        assertTrue(cursor.isAfterLast());
+    }
+
+    @Test
+    public void giftCardsViaCursorWithOneStarred()      //sorting test; stared card should appear first
+    {
+        final int CARDS_TO_ADD = 10;
+        long id;
+        // Add the gift cards in reverse order and add one with STAR, to ensure
+        // that they are sorted
+        for(int index = CARDS_TO_ADD-1; index >= 0; index--)
+        {
+            if (index == CARDS_TO_ADD-1) {
+                id = db.insertLoyaltyCard("store" + index, "note" + index, "cardId" + index,
+                        BarcodeFormat.UPC_A.toString(), index, index*2, 1);
+            }
+
+            else {
+                id = db.insertLoyaltyCard("store" + index, "note" + index, "cardId" + index,
+                        BarcodeFormat.UPC_A.toString(), index, index*2, 0);
+            }
+            boolean result = (id != -1);
+            assertTrue(result);
+        }
+
+        assertEquals(CARDS_TO_ADD, db.getLoyaltyCardCount());
+
+        Cursor cursor = db.getLoyaltyCardCursor();
+        assertNotNull(cursor);
+
+        assertEquals(CARDS_TO_ADD, cursor.getCount());
+
+        cursor.moveToFirst();
+        int index = CARDS_TO_ADD-1 ;
+        assertEquals("store"+index, cursor.getString(cursor.getColumnIndexOrThrow(DBHelper.LoyaltyCardDbIds.STORE)));
+        assertEquals("note"+index, cursor.getString(cursor.getColumnIndexOrThrow(DBHelper.LoyaltyCardDbIds.NOTE)));
+        assertEquals("cardId"+index, cursor.getString(cursor.getColumnIndexOrThrow(DBHelper.LoyaltyCardDbIds.CARD_ID)));
+        assertEquals("cardId"+index, cursor.getString(cursor.getColumnIndexOrThrow(DBHelper.LoyaltyCardDbIds.CARD_ID)));
+        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();
+
+        for(index = 0; index < CARDS_TO_ADD-1; index++)
+        {
+            assertEquals("store"+index, cursor.getString(cursor.getColumnIndexOrThrow(DBHelper.LoyaltyCardDbIds.STORE)));
+            assertEquals("note"+index, cursor.getString(cursor.getColumnIndexOrThrow(DBHelper.LoyaltyCardDbIds.NOTE)));
+            assertEquals("cardId"+index, cursor.getString(cursor.getColumnIndexOrThrow(DBHelper.LoyaltyCardDbIds.CARD_ID)));
+            assertEquals("cardId"+index, cursor.getString(cursor.getColumnIndexOrThrow(DBHelper.LoyaltyCardDbIds.CARD_ID)));
+            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)));
 

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

@@ -3,12 +3,10 @@ package protect.card_locker;
 import android.app.Activity;
 import android.database.Cursor;
 import android.database.sqlite.SQLiteDatabase;
-import android.net.Uri;
 import android.os.Environment;
 
 import com.google.zxing.BarcodeFormat;
 
-import org.apache.tools.ant.filters.StringInputStream;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -25,7 +23,6 @@ import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStreamReader;
 import java.io.OutputStreamWriter;
-import java.net.URI;
 import java.nio.charset.StandardCharsets;
 import java.util.Calendar;
 
@@ -71,7 +68,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);
+            long id = db.insertLoyaltyCard(storeName, note, BARCODE_DATA, BARCODE_TYPE, index, index*2, 0);
             boolean result = (id != -1);
             assertTrue(result);
         }
@@ -79,6 +76,30 @@ public class ImportExportTest
         assertEquals(cardsToAdd, db.getLoyaltyCardCount());
     }
 
+    private void addLoyaltyCardsFiveStarred()
+    {
+        int cardsToAdd = 9;
+        // Add in reverse order to test sorting
+        for(int index = cardsToAdd; index > 4; index--)
+        {
+            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);
+            boolean result = (id != -1);
+            assertTrue(result);
+        }
+        for(int index = cardsToAdd-5; index > 0; index--)
+        {
+            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);
+            boolean result = (id != -1);
+            assertTrue(result);
+        }
+        assertEquals(cardsToAdd, db.getLoyaltyCardCount());
+    }
+
     /**
      * Check that all of the cards follow the pattern
      * specified in addLoyaltyCards(), and are in sequential order
@@ -102,12 +123,64 @@ public class ImportExportTest
             assertEquals(BARCODE_TYPE, card.barcodeType);
             assertEquals(Integer.valueOf(index), card.headerColor);
             assertEquals(Integer.valueOf(index*2), card.headerTextColor);
+            assertEquals(0, card.starStatus);
 
             index++;
         }
         cursor.close();
     }
 
+    /**
+     * Check that all of the cards follow the pattern
+     * specified in addLoyaltyCardsSomeStarred(), and are in sequential order
+     * with starred ones first
+     */
+    private void checkLoyaltyCardsFiveStarred()
+        {
+            Cursor cursor = db.getLoyaltyCardCursor();
+            int index = 5;
+
+            while(index<10)
+        {
+            cursor.moveToNext();
+            LoyaltyCard card = LoyaltyCard.toLoyaltyCard(cursor);
+
+            String expectedStore = String.format("store, \"%4d", index);
+            String expectedNote = String.format("note, \"%4d", index);
+
+            assertEquals(expectedStore, card.store);
+            assertEquals(expectedNote, card.note);
+            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++;
+        }
+
+        index = 1;
+        while(cursor.moveToNext() && index<5)
+    {
+        LoyaltyCard card = LoyaltyCard.toLoyaltyCard(cursor);
+
+        String expectedStore = String.format("store, \"%4d", index);
+        String expectedNote = String.format("note, \"%4d", index);
+
+        assertEquals(expectedStore, card.store);
+        assertEquals(expectedNote, card.note);
+        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++;
+    }
+
+        cursor.close();
+    }
+
     /**
      * Delete the contents of the database
      */
@@ -155,6 +228,41 @@ public class ImportExportTest
         }
     }
 
+    @Test
+    public void multipleCardsExportImportSomeStarred() throws IOException
+    {
+        final int NUM_CARDS = 9;
+
+        for(DataFormat format : DataFormat.values())
+        {
+            addLoyaltyCardsFiveStarred();
+
+            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());
+
+            checkLoyaltyCardsFiveStarred();
+
+            // Clear the database for the next format under test
+            clearDatabase();
+        }
+    }
+
     @Test
     public void importExistingCardsNotReplace() throws IOException
     {
@@ -291,11 +399,13 @@ public class ImportExportTest
     {
         String csvText = "";
         csvText += DBHelper.LoyaltyCardDbIds.ID + "," +
-                       DBHelper.LoyaltyCardDbIds.STORE + "," +
-                       DBHelper.LoyaltyCardDbIds.NOTE + "," +
-                       DBHelper.LoyaltyCardDbIds.CARD_ID + "," +
-                       DBHelper.LoyaltyCardDbIds.BARCODE_TYPE + "\n";
-        csvText += "1,store,note,12345,type";
+                DBHelper.LoyaltyCardDbIds.STORE + "," +
+                DBHelper.LoyaltyCardDbIds.NOTE + "," +
+                DBHelper.LoyaltyCardDbIds.CARD_ID + "," +
+                DBHelper.LoyaltyCardDbIds.BARCODE_TYPE + "," +
+                DBHelper.LoyaltyCardDbIds.STAR_STATUS + "\n";
+
+        csvText += "1,store,note,12345,type,0";
 
         ByteArrayInputStream inputStream = new ByteArrayInputStream(csvText.getBytes(StandardCharsets.UTF_8));
         InputStreamReader inStream = new InputStreamReader(inputStream);
@@ -311,6 +421,7 @@ public class ImportExportTest
         assertEquals("note", card.note);
         assertEquals("12345", card.cardId);
         assertEquals("type", card.barcodeType);
+        assertEquals(0, card.starStatus);
         assertNull(card.headerColor);
         assertNull(card.headerTextColor);
     }
@@ -325,8 +436,10 @@ public class ImportExportTest
                 DBHelper.LoyaltyCardDbIds.CARD_ID + "," +
                 DBHelper.LoyaltyCardDbIds.BARCODE_TYPE + "," +
                 DBHelper.LoyaltyCardDbIds.HEADER_COLOR + "," +
-                DBHelper.LoyaltyCardDbIds.HEADER_TEXT_COLOR + "\n";
-        csvText += "1,store,note,12345,type,,";
+                DBHelper.LoyaltyCardDbIds.HEADER_TEXT_COLOR + "," +
+                DBHelper.LoyaltyCardDbIds.STAR_STATUS + "\n";
+
+        csvText += "1,store,note,12345,type,,,0";
 
         ByteArrayInputStream inputStream = new ByteArrayInputStream(csvText.getBytes(StandardCharsets.UTF_8));
         InputStreamReader inStream = new InputStreamReader(inputStream);
@@ -342,6 +455,7 @@ public class ImportExportTest
         assertEquals("note", card.note);
         assertEquals("12345", card.cardId);
         assertEquals("type", card.barcodeType);
+        assertEquals(0, card.starStatus);
         assertNull(card.headerColor);
         assertNull(card.headerTextColor);
     }
@@ -356,8 +470,10 @@ public class ImportExportTest
                 DBHelper.LoyaltyCardDbIds.CARD_ID + "," +
                 DBHelper.LoyaltyCardDbIds.BARCODE_TYPE + "," +
                 DBHelper.LoyaltyCardDbIds.HEADER_COLOR + "," +
-                DBHelper.LoyaltyCardDbIds.HEADER_TEXT_COLOR + "\n";
-        csvText += "1,store,note,12345,type,not a number,invalid";
+                DBHelper.LoyaltyCardDbIds.HEADER_TEXT_COLOR + "," +
+                DBHelper.LoyaltyCardDbIds.STAR_STATUS + "\n";
+
+        csvText += "1,store,note,12345,type,not a number,invalid,0";
 
         ByteArrayInputStream inputStream = new ByteArrayInputStream(csvText.getBytes(StandardCharsets.UTF_8));
         InputStreamReader inStream = new InputStreamReader(inputStream);
@@ -378,8 +494,10 @@ public class ImportExportTest
                 DBHelper.LoyaltyCardDbIds.CARD_ID + "," +
                 DBHelper.LoyaltyCardDbIds.BARCODE_TYPE + "," +
                 DBHelper.LoyaltyCardDbIds.HEADER_COLOR + "," +
-                DBHelper.LoyaltyCardDbIds.HEADER_TEXT_COLOR + "\n";
-        csvText += "1,store,note,12345,,1,1";
+                DBHelper.LoyaltyCardDbIds.HEADER_TEXT_COLOR + "," +
+                DBHelper.LoyaltyCardDbIds.STAR_STATUS + "\n";
+
+        csvText += "1,store,note,12345,,1,1,0";
 
         ByteArrayInputStream inputStream = new ByteArrayInputStream(csvText.getBytes(StandardCharsets.UTF_8));
         InputStreamReader inStream = new InputStreamReader(inputStream);
@@ -395,7 +513,132 @@ public class ImportExportTest
         assertEquals("note", card.note);
         assertEquals("12345", card.cardId);
         assertEquals("", card.barcodeType);
+        assertEquals(0, card.starStatus);
         assertEquals(1, (long) card.headerColor);
         assertEquals(1, (long) card.headerTextColor);
     }
+
+    @Test
+    public void importWithStarredField() throws IOException
+    {
+        String csvText = "";
+        csvText += DBHelper.LoyaltyCardDbIds.ID + "," +
+                DBHelper.LoyaltyCardDbIds.STORE + "," +
+                DBHelper.LoyaltyCardDbIds.NOTE + "," +
+                DBHelper.LoyaltyCardDbIds.CARD_ID + "," +
+                DBHelper.LoyaltyCardDbIds.BARCODE_TYPE + "," +
+                DBHelper.LoyaltyCardDbIds.HEADER_COLOR + "," +
+                DBHelper.LoyaltyCardDbIds.HEADER_TEXT_COLOR + "," +
+                DBHelper.LoyaltyCardDbIds.STAR_STATUS + "\n";
+
+        csvText += "1,store,note,12345,type,1,1,1";
+
+        ByteArrayInputStream inputStream = new ByteArrayInputStream(csvText.getBytes(StandardCharsets.UTF_8));
+        InputStreamReader inStream = new InputStreamReader(inputStream);
+
+        // Import the CSV data
+        boolean result = MultiFormatImporter.importData(db, inStream, DataFormat.CSV);
+        assertEquals(true, result);
+        assertEquals(1, db.getLoyaltyCardCount());
+
+        LoyaltyCard card = db.getLoyaltyCard(1);
+
+        assertEquals("store", card.store);
+        assertEquals("note", card.note);
+        assertEquals("12345", card.cardId);
+        assertEquals("type", card.barcodeType);
+        assertEquals(1, card.starStatus);
+        assertEquals(1, (long) card.headerColor);
+        assertEquals(1, (long) card.headerTextColor);
+    }
+
+
+
+    @Test
+    public void importWithNoStarredField() throws IOException
+    {
+        String csvText = "";
+        csvText += DBHelper.LoyaltyCardDbIds.ID + "," +
+                DBHelper.LoyaltyCardDbIds.STORE + "," +
+                DBHelper.LoyaltyCardDbIds.NOTE + "," +
+                DBHelper.LoyaltyCardDbIds.CARD_ID + "," +
+                DBHelper.LoyaltyCardDbIds.BARCODE_TYPE + "," +
+                DBHelper.LoyaltyCardDbIds.HEADER_COLOR + "," +
+                DBHelper.LoyaltyCardDbIds.HEADER_TEXT_COLOR + "," +
+                DBHelper.LoyaltyCardDbIds.STAR_STATUS + "\n";
+
+        csvText += "1,store,note,12345,type,1,1,";
+
+        ByteArrayInputStream inputStream = new ByteArrayInputStream(csvText.getBytes(StandardCharsets.UTF_8));
+        InputStreamReader inStream = new InputStreamReader(inputStream);
+
+        // Import the CSV data
+        boolean result = MultiFormatImporter.importData(db, inStream, DataFormat.CSV);
+        assertEquals(true, result);
+        assertEquals(1, db.getLoyaltyCardCount());
+
+        LoyaltyCard card = db.getLoyaltyCard(1);
+
+        assertEquals("store", card.store);
+        assertEquals("note", card.note);
+        assertEquals("12345", card.cardId);
+        assertEquals("type", card.barcodeType);
+        assertEquals(0, card.starStatus);
+        assertEquals(1, (long) card.headerColor);
+        assertEquals(1, (long) card.headerTextColor);
+    }
+
+    @Test
+    public void importWithInvalidStarField() throws IOException
+    {
+        String csvText = "";
+        csvText += DBHelper.LoyaltyCardDbIds.ID + "," +
+                DBHelper.LoyaltyCardDbIds.STORE + "," +
+                DBHelper.LoyaltyCardDbIds.NOTE + "," +
+                DBHelper.LoyaltyCardDbIds.CARD_ID + "," +
+                DBHelper.LoyaltyCardDbIds.BARCODE_TYPE + "," +
+                DBHelper.LoyaltyCardDbIds.HEADER_COLOR + "," +
+                DBHelper.LoyaltyCardDbIds.HEADER_TEXT_COLOR + "," +
+                DBHelper.LoyaltyCardDbIds.STAR_STATUS + "\n";
+
+        csvText += "1,store,note,12345,type,1,1,2";
+
+        ByteArrayInputStream inputStream = new ByteArrayInputStream(csvText.getBytes(StandardCharsets.UTF_8));
+        InputStreamReader inStream = new InputStreamReader(inputStream);
+
+        // Import the CSV data
+        boolean result = MultiFormatImporter.importData(db, inStream, DataFormat.CSV);
+        assertTrue(result);
+        assertEquals(1, db.getLoyaltyCardCount());
+
+        csvText = "";
+        csvText += DBHelper.LoyaltyCardDbIds.ID + "," +
+                DBHelper.LoyaltyCardDbIds.STORE + "," +
+                DBHelper.LoyaltyCardDbIds.NOTE + "," +
+                DBHelper.LoyaltyCardDbIds.CARD_ID + "," +
+                DBHelper.LoyaltyCardDbIds.BARCODE_TYPE + "," +
+                DBHelper.LoyaltyCardDbIds.HEADER_COLOR + "," +
+                DBHelper.LoyaltyCardDbIds.HEADER_TEXT_COLOR + "," +
+                DBHelper.LoyaltyCardDbIds.STAR_STATUS + "\n";
+
+        csvText += "1,store,note,12345,type,1,1,text";
+
+        inputStream = new ByteArrayInputStream(csvText.getBytes(StandardCharsets.UTF_8));
+        inStream = new InputStreamReader(inputStream);
+
+        // Import the CSV data
+        result = MultiFormatImporter.importData(db, inStream, DataFormat.CSV);
+        assertTrue(result);
+        assertEquals(1, db.getLoyaltyCardCount());
+
+        LoyaltyCard card = db.getLoyaltyCard(1);
+
+        assertEquals("store", card.store);
+        assertEquals("note", card.note);
+        assertEquals("12345", card.cardId);
+        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

@@ -11,6 +11,7 @@ import org.robolectric.Robolectric;
 import org.robolectric.RobolectricTestRunner;
 import org.robolectric.annotation.Config;
 import java.io.InvalidObjectException;
+
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
@@ -34,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);
+        db.insertLoyaltyCard("store", "note", BarcodeFormat.UPC_A.toString(), LoyaltyCardDbIds.BARCODE_TYPE, Color.BLACK, Color.WHITE, 1);
 
         // Get card
         LoyaltyCard card = db.getLoyaltyCard(1);
@@ -52,13 +53,15 @@ public class ImportURITest {
         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
+        assertEquals(0, parsedCard.starStatus);
     }
 
     @Test
     public void ensureNoCrashOnMissingHeaderFields() throws InvalidObjectException
     {
         // Generate card
-        db.insertLoyaltyCard("store", "note", BarcodeFormat.UPC_A.toString(), LoyaltyCardDbIds.BARCODE_TYPE, null, null);
+        db.insertLoyaltyCard("store", "note", BarcodeFormat.UPC_A.toString(), LoyaltyCardDbIds.BARCODE_TYPE, null, null, 0);
 
         // Get card
         LoyaltyCard card = db.getLoyaltyCard(1);
@@ -88,4 +91,36 @@ public class ImportURITest {
             // Desired behaviour
         }
     }
+
+    @Test
+    public void failToParseBadData()
+    {
+        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"));
+            assertTrue(false); // Shouldn't get here
+        } catch(InvalidObjectException ex) {
+            // Desired behaviour
+        }
+    }
+
+    @Test
+    public void parseAdditionalUnforeseenData()
+    {
+        LoyaltyCard parsedCard = null;
+        try {
+            parsedCard = importURIHelper.parse(Uri.parse("https://brarcher.github.io/loyalty-card-locker/share?store=store&note=note&cardid=12345&barcodetype=ITF&headercolor=-416706&headertextcolor=-1&notforeseen=no"));
+        } catch (InvalidObjectException e) {
+            e.printStackTrace();
+        }
+
+        // Compare everything
+        assertEquals("ITF", parsedCard.barcodeType);
+        assertEquals("12345", parsedCard.cardId);
+        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

@@ -6,6 +6,7 @@ import android.database.Cursor;
 import android.graphics.Color;
 import android.preference.PreferenceManager;
 import android.view.View;
+import android.widget.ImageView;
 import android.widget.TextView;
 
 import com.google.zxing.BarcodeFormat;
@@ -83,7 +84,7 @@ public class LoyaltyCardCursorAdapterTest
     @Test
     public void TestCursorAdapterEmptyNote()
     {
-        db.insertLoyaltyCard("store", "", "cardId", BarcodeFormat.UPC_A.toString(), Color.BLACK, Color.WHITE);
+        db.insertLoyaltyCard("store", "", "cardId", BarcodeFormat.UPC_A.toString(), Color.BLACK, Color.WHITE, 0);
         LoyaltyCard card = db.getLoyaltyCard(1);
 
         Cursor cursor = db.getLoyaltyCardCursor();
@@ -97,7 +98,7 @@ public class LoyaltyCardCursorAdapterTest
     @Test
     public void TestCursorAdapterWithNote()
     {
-        db.insertLoyaltyCard("store", "note", "cardId", BarcodeFormat.UPC_A.toString(), Color.BLACK, Color.WHITE);
+        db.insertLoyaltyCard("store", "note", "cardId", BarcodeFormat.UPC_A.toString(), Color.BLACK, Color.WHITE, 0);
         LoyaltyCard card = db.getLoyaltyCard(1);
 
         Cursor cursor = db.getLoyaltyCardCursor();
@@ -111,7 +112,7 @@ public class LoyaltyCardCursorAdapterTest
     @Test
     public void TestCursorAdapterFontSizes()
     {
-        db.insertLoyaltyCard("store", "note", "cardId", BarcodeFormat.UPC_A.toString(), Color.BLACK, Color.WHITE);
+        db.insertLoyaltyCard("store", "note", "cardId", BarcodeFormat.UPC_A.toString(), Color.BLACK, Color.WHITE, 0);
         LoyaltyCard card = db.getLoyaltyCard(1);
 
         Cursor cursor = db.getLoyaltyCardCursor();
@@ -125,4 +126,29 @@ public class LoyaltyCardCursorAdapterTest
         view = createView(cursor);
         checkView(view, card.store, card.note, true);
     }
+
+    @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);
+
+
+        Cursor cursor = db.getLoyaltyCardCursor();
+        cursor.moveToFirst();
+        View view = createView(cursor);
+        ImageView star = view.findViewById(R.id.star);
+        assertEquals(View.VISIBLE, star.getVisibility());
+
+        cursor.moveToNext();
+        view = createView(cursor);
+        star = view.findViewById(R.id.star);
+        assertEquals(View.VISIBLE, star.getVisibility());
+
+        cursor.moveToNext();
+        view = createView(cursor);
+        star = view.findViewById(R.id.star);
+        assertEquals(View.GONE, star.getVisibility());
+    }
 }

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

@@ -400,7 +400,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);
+        db.insertLoyaltyCard("store", "note", BARCODE_DATA, BARCODE_TYPE, Color.BLACK, Color.WHITE, 0);
 
         activityController.start();
         activityController.visible();
@@ -416,7 +416,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);
+        db.insertLoyaltyCard("store", "note", BARCODE_DATA, BARCODE_TYPE, Color.BLACK, Color.WHITE, 0);
 
         activityController.start();
         activityController.visible();
@@ -432,7 +432,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);
+        db.insertLoyaltyCard("store", "note", EAN_BARCODE_DATA, EAN_BARCODE_TYPE, Color.BLACK, Color.WHITE, 0);
 
         activityController.start();
         activityController.visible();
@@ -453,7 +453,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);
+        db.insertLoyaltyCard("store", "note", EAN_BARCODE_DATA, EAN_BARCODE_TYPE, Color.BLACK, Color.WHITE, 0);
 
         activityController.start();
         activityController.visible();
@@ -479,7 +479,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);
+        db.insertLoyaltyCard("store", "note", BARCODE_DATA, BARCODE_TYPE, Color.BLACK, Color.WHITE, 0);
 
         activityController.start();
         activityController.visible();
@@ -488,11 +488,12 @@ public class LoyaltyCardViewActivityTest
         final Menu menu = shadowOf(activity).getOptionsMenu();
         assertTrue(menu != null);
 
-        // The share and settings button should be present
-        assertEquals(menu.size(), 2);
+        // The share, settings, add and star button should be present
+        assertEquals(menu.size(), 3);
 
         assertEquals("Block Rotation", menu.findItem(R.id.action_lock_unlock).getTitle().toString());
         assertEquals("Share", menu.findItem(R.id.action_share).getTitle().toString());
+        assertEquals("Add to favorites", menu.findItem(R.id.action_star_unstar).getTitle().toString());
     }
 
     @Test
@@ -522,7 +523,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);
+        db.insertLoyaltyCard("store", "note", BARCODE_DATA, BARCODE_TYPE, Color.BLACK, Color.WHITE, 0);
 
         activityController.start();
         activityController.visible();
@@ -540,7 +541,7 @@ public class LoyaltyCardViewActivityTest
 
         Activity activity = (Activity)activityController.get();
         DBHelper db = new DBHelper(activity);
-        db.insertLoyaltyCard("store", "note", BARCODE_DATA, BARCODE_TYPE, null, null);
+        db.insertLoyaltyCard("store", "note", BARCODE_DATA, BARCODE_TYPE, null, null, 0);
 
         activityController.start();
         activityController.visible();
@@ -558,7 +559,7 @@ public class LoyaltyCardViewActivityTest
 
         Activity activity = (Activity)activityController.get();
         DBHelper db = new DBHelper(activity);
-        db.insertLoyaltyCard("store", "note", BARCODE_DATA, BARCODE_TYPE, null, null);
+        db.insertLoyaltyCard("store", "note", BARCODE_DATA, BARCODE_TYPE, null, null, 0);
 
         activityController.start();
         activityController.visible();
@@ -575,7 +576,7 @@ public class LoyaltyCardViewActivityTest
 
         Activity activity = (Activity)activityController.get();
         DBHelper db = new DBHelper(activity);
-        db.insertLoyaltyCard("store", "note", BARCODE_DATA, "", Color.BLACK, Color.WHITE);
+        db.insertLoyaltyCard("store", "note", BARCODE_DATA, "", Color.BLACK, Color.WHITE, 0);
 
         activityController.start();
         activityController.visible();
@@ -592,7 +593,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);
+        db.insertLoyaltyCard("store", "note", BARCODE_DATA, BARCODE_TYPE, Color.BLACK, Color.WHITE, 0);
 
         activityController.start();
         activityController.visible();
@@ -619,7 +620,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);
+        db.insertLoyaltyCard("store", "note", BARCODE_DATA, BARCODE_TYPE, Color.BLACK, Color.WHITE, 0);
 
         final int STORE_FONT_SIZE = 50;
         final int CARD_FONT_SIZE = 40;
@@ -661,7 +662,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);
+            db.insertLoyaltyCard("store", "note", BARCODE_DATA, BARCODE_TYPE, Color.BLACK, Color.WHITE, 0);
 
             SharedPreferences settings = PreferenceManager.getDefaultSharedPreferences(activity);
             settings.edit()
@@ -689,6 +690,35 @@ public class LoyaltyCardViewActivityTest
         }
     }
 
+    @Test
+    public void checkPushStarIcon()
+    {
+        ActivityController activityController = createActivityWithLoyaltyCard(false);
+
+        Activity activity = (Activity) activityController.get();
+        DBHelper db = new DBHelper(activity);
+        db.insertLoyaltyCard("store", "note", BARCODE_DATA, BARCODE_TYPE, Color.BLACK, Color.WHITE,0);
+        activityController.start();
+        activityController.visible();
+        activityController.resume();
+
+        assertEquals(false, activity.isFinishing());
+
+        final Menu menu = shadowOf(activity).getOptionsMenu();
+        assertTrue(menu != null);
+
+        // The share, settings and star button should be present
+        assertEquals(menu.size(), 3);
+
+        assertEquals("Add to favorites", menu.findItem(R.id.action_star_unstar).getTitle().toString());
+
+        shadowOf(activity).clickMenuItem(R.id.action_star_unstar);
+        assertEquals("Remove from favorites", menu.findItem(R.id.action_star_unstar).getTitle().toString());
+
+        shadowOf(activity).clickMenuItem(R.id.action_star_unstar);
+        assertEquals("Add to favorites", menu.findItem(R.id.action_star_unstar).getTitle().toString());
+    }
+
     @Test
     public void checkBarcodeFullscreenWorkflow()
     {
@@ -696,7 +726,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);
+        db.insertLoyaltyCard("store", "note", BARCODE_DATA, BARCODE_TYPE, Color.BLACK, Color.WHITE, 0);
 
         activityController.start();
         activityController.visible();

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

@@ -8,7 +8,6 @@ import android.content.SharedPreferences;
 import android.database.Cursor;
 import android.graphics.Color;
 import android.os.Bundle;
-import androidx.appcompat.widget.SearchView;
 import android.view.Menu;
 import android.view.View;
 import android.widget.ListView;
@@ -98,7 +97,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);
+        db.insertLoyaltyCard("store", "note", "cardId", BarcodeFormat.UPC_A.toString(), Color.BLACK, Color.WHITE, 0);
 
         assertEquals(View.VISIBLE, helpText.getVisibility());
         assertEquals(View.GONE, noMatchingCardsText.getVisibility());
@@ -116,6 +115,56 @@ public class MainActivityTest
         assertNotNull(cursor);
     }
 
+    @Test
+    public void addFourLoyaltyCardsTwoStarred()  // Main screen showing starred cards on top correctly
+    {
+        ActivityController activityController = Robolectric.buildActivity(MainActivity.class).create();
+
+        Activity mainActivity = (Activity)activityController.get();
+        activityController.start();
+        activityController.resume();
+
+        TextView helpText = mainActivity.findViewById(R.id.helpText);
+        TextView noMatchingCardsText = mainActivity.findViewById(R.id.noMatchingCardsText);
+        ListView list = mainActivity.findViewById(R.id.list);
+
+        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);
+
+        assertEquals(View.VISIBLE, helpText.getVisibility());
+        assertEquals(View.GONE, noMatchingCardsText.getVisibility());
+        assertEquals(View.GONE, list.getVisibility());
+
+        activityController.pause();
+        activityController.resume();
+
+        assertEquals(View.GONE, helpText.getVisibility());
+        assertEquals(View.GONE, noMatchingCardsText.getVisibility());
+        assertEquals(View.VISIBLE, list.getVisibility());
+
+        assertEquals(4, list.getAdapter().getCount());
+        Cursor cursor = (Cursor)list.getAdapter().getItem(0);
+        assertNotNull(cursor);
+        assertEquals("storeC",cursor.getString(cursor.getColumnIndex("store")));
+
+        cursor = (Cursor)list.getAdapter().getItem(1);
+        assertNotNull(cursor);
+        assertEquals("storeD",cursor.getString(cursor.getColumnIndex("store")));
+
+        cursor = (Cursor)list.getAdapter().getItem(2);
+        assertNotNull(cursor);
+        assertEquals("storeA",cursor.getString(cursor.getColumnIndex("store")));
+
+        cursor = (Cursor)list.getAdapter().getItem(3);
+        assertNotNull(cursor);
+        assertEquals("storeB",cursor.getString(cursor.getColumnIndex("store")));
+    }
+
     @Test
     public void testFiltering()
     {
@@ -130,8 +179,8 @@ public class MainActivityTest
         ListView list = mainActivity.findViewById(R.id.list);
 
         DBHelper db = new DBHelper(mainActivity);
-        db.insertLoyaltyCard("The First Store", "Initial note", "cardId", BarcodeFormat.UPC_A.toString(), Color.BLACK, Color.WHITE);
-        db.insertLoyaltyCard("The Second Store", "Secondary note", "cardId", BarcodeFormat.UPC_A.toString(), Color.BLACK, Color.WHITE);
+        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);
 
         activityController.pause();
         activityController.resume();

docs/README.md

@@ -6,6 +6,10 @@
 <a href="https://play.google.com/store/apps/details?id=me.hackerchick.catima" target="_blank">
 <img src="https://play.google.com/intl/en_us/badges/images/generic/en-play-badge.png" alt="Get it on Google Play" height="90"/></a>
 
+![Logo](https://github.com/TheLastProject/Catima/raw/master/app/src/main/ic_launcher-playstore.png)
+
+*Logo by [Rose (TangentFoxy)](http://github.com/TangentFoxy)*
+
 Stores all of your store loyalty cards on your phone, removing the need to carry them around.  Currently the following barcode types are supported:
 
 - AZTEC

gradle/wrapper/gradle-wrapper.properties

@@ -1,4 +1,4 @@
-#Wed Jun 27 14:32:00 EDT 2018
+#Sun Jul 19 15:12:56 CEST 2020
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME

logo.svg

@@ -0,0 +1,133 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="192"
+   height="192"
+   viewBox="0 0 50.799999 50.799999"
+   version="1.1"
+   id="svg8"
+   inkscape:version="1.0.1 (3bc2e813f5, 2020-09-07)"
+   sodipodi:docname="Catima v1.svg">
+  <defs
+     id="defs2" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="1"
+     inkscape:cx="89.145455"
+     inkscape:cy="91.226471"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     inkscape:document-rotation="0"
+     showgrid="false"
+     units="px"
+     inkscape:snap-object-midpoints="false"
+     inkscape:pagecheckerboard="true"
+     inkscape:snap-global="false"
+     inkscape:window-width="1366"
+     inkscape:window-height="705"
+     inkscape:window-x="0"
+     inkscape:window-y="30"
+     inkscape:window-maximized="1" />
+  <metadata
+     id="metadata5">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1">
+    <rect
+       style="fill:#f0f0f0;fill-opacity:1;stroke:#c80000;stroke-width:0.529167;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect851"
+       width="22.693819"
+       height="14.164361"
+       x="4.881855"
+       y="24.280193"
+       transform="rotate(-24)" />
+    <rect
+       style="fill:#f0f0f0;fill-opacity:1;stroke:#c80000;stroke-width:0.529167;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect847"
+       width="25.4"
+       height="16.933332"
+       x="18.049208"
+       y="3.9664748"
+       transform="rotate(24)" />
+    <rect
+       style="fill:#c80000;fill-opacity:1;fill-rule:evenodd;stroke:#c80000;stroke-width:1.5875;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect843"
+       width="27.615681"
+       height="16.503178"
+       x="20.365749"
+       y="10.945274"
+       transform="rotate(16)" />
+    <rect
+       style="fill:#ff0000;fill-opacity:1;fill-rule:evenodd;stroke:#ff0000;stroke-width:1.5875;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect18"
+       width="27.615681"
+       height="16.503178"
+       x="12.010998"
+       y="15.495529" />
+    <ellipse
+       style="fill:#ff0000;fill-opacity:1;stroke:#ff0000;stroke-width:0.91078;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path845"
+       cx="12.213013"
+       cy="23.747116"
+       rx="4.3658643"
+       ry="8.5899496" />
+    <path
+       style="fill:none;fill-opacity:1;stroke:#f0f0f0;stroke-width:0.529167;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path853"
+       sodipodi:type="arc"
+       sodipodi:cx="22.827261"
+       sodipodi:cy="25.781031"
+       sodipodi:rx="1.6710632"
+       sodipodi:ry="1.6710632"
+       sodipodi:start="0"
+       sodipodi:end="2.7925268"
+       sodipodi:arc-type="arc"
+       d="m 24.498324,25.781031 a 1.6710632,1.6710632 0 0 1 -1.380886,1.645676 1.6710632,1.6710632 0 0 1 -1.860463,-1.074139"
+       sodipodi:open="true" />
+    <path
+       style="fill:none;fill-opacity:1;stroke:#f0f0f0;stroke-width:0.529167;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path855"
+       sodipodi:type="arc"
+       sodipodi:cx="26.228834"
+       sodipodi:cy="25.761429"
+       sodipodi:rx="1.6710632"
+       sodipodi:ry="1.6710632"
+       sodipodi:start="0.34906585"
+       sodipodi:end="3.1415927"
+       sodipodi:arc-type="arc"
+       d="m 27.79912,26.332966 a 1.6710632,1.6710632 0 0 1 -1.860463,1.074139 1.6710632,1.6710632 0 0 1 -1.380886,-1.645676"
+       sodipodi:open="true" />
+    <path
+       style="fill:none;stroke:#f0f0f0;stroke-width:0.529167;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 16.060603,22.270951 2.645833,-2.645833 2.645833,2.645833"
+       id="path859"
+       sodipodi:nodetypes="ccc" />
+    <path
+       style="fill:none;stroke:#f0f0f0;stroke-width:0.529167;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 27.702269,22.27095 2.645833,-2.645833 2.645833,2.645833"
+       id="path861"
+       sodipodi:nodetypes="ccc" />
+  </g>
+</svg>