New feature: Favorite cards

app/build.gradle

@@ -54,6 +54,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 ApplicationTest()
     {
         super(Application.class);
     }
-}
+}

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

@@ -25,7 +25,8 @@ public void exportData(DBHelper db, OutputStreamWriter output) throws IOExceptio
                 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 void exportData(DBHelper db, OutputStreamWriter output) throws IOExceptio
                     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 @@ private void importLoyaltyCard(SQLiteDatabase database, DBHelper helper, CSVReco
             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 = "LoyaltyCards.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 @@ static class LoyaltyCardDbIds
         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 void onCreate(SQLiteDatabase db)
                 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 void onUpgrade(SQLiteDatabase db, int oldVersion, int newVersion)
             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,14 +85,15 @@ public long insertLoyaltyCard(final String store, final String note, final Strin
         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;
     }
 
     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 boolean insertLoyaltyCard(final SQLiteDatabase db, final int id,
         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 boolean updateLoyaltyCard(final int id, final String store, final String
         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 Cursor getLoyaltyCardCursor(final String filter)
         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;
@@ -43,6 +46,8 @@ public LoyaltyCard parse(Uri uri) throws InvalidObjectException {
             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)
             {
@@ -53,7 +58,8 @@ public LoyaltyCard parse(Uri uri) throws InvalidObjectException {
             {
                 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");
         }
@@ -77,7 +83,7 @@ protected Uri toUri(LoyaltyCard loyaltyCard) {
         {
             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 LoyaltyCard(final int id, final String store, final String note, final St
         this.barcodeType = barcodeType;
         this.headerColor = headerColor;
         this.headerTextColor = headerTextColor;
+        this.starStatus = starStatus;
     }
 
     public static LoyaltyCard toLoyaltyCard(Cursor cursor)
@@ -36,6 +39,8 @@ public static LoyaltyCard toLoyaltyCard(Cursor cursor)
         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 static LoyaltyCard toLoyaltyCard(Cursor cursor)
             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

@@ -38,6 +38,7 @@ public void bindView(View view, Context context, Cursor cursor)
         ImageView thumbnail = view.findViewById(R.id.thumbnail);
         TextView storeField = (TextView) view.findViewById(R.id.store);
         TextView noteField = (TextView) view.findViewById(R.id.note);
+        ImageView star = view.findViewById(R.id.star);
 
         // Extract properties from cursor
         LoyaltyCard loyaltyCard = LoyaltyCard.toLoyaltyCard(cursor);
@@ -58,6 +59,9 @@ public void bindView(View view, Context context, Cursor cursor)
             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

@@ -395,13 +395,13 @@ private void doSave()
         }
 
         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

@@ -55,6 +55,7 @@ public class LoyaltyCardViewActivity extends AppCompatActivity
     String cardIdString;
     BarcodeFormat format;
 
+    boolean starred;
     boolean backgroundNeedsDarkIcons;
     boolean barcodeIsFullscreen = false;
     ViewGroup.LayoutParams barcodeImageState;
@@ -302,12 +303,30 @@ public boolean onCreateOptionsMenu(Menu menu)
             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));
         menu.findItem(R.id.action_edit).setIcon(getIcon(R.drawable.ic_mode_edit_white_24dp, 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)
     {
@@ -344,11 +363,18 @@ public boolean onOptionsItemSelected(MenuItem item)
                 }
                 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)

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

@@ -17,4 +17,9 @@
         android:icon="@drawable/ic_mode_edit_white_24dp"
         android:title="@string/edit"
         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/values-de/strings.xml

@@ -21,6 +21,8 @@
     <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>

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>
@@ -79,6 +82,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="startIntro">Start Intro</string>
     <string name="intro1Title">Welcome to Loyalty Card Keychain\n</string>