Release Catima 2.0.4

CHANGELOG.md

@@ -1,5 +1,19 @@
 # Changelog
 
+## v2.0.4 (2021-07-27)
+
+Changes:
+
+- Fix shortcut creation
+- Generate card-specific shortcut icon
+- Fix ability to change loyalty card colour
+
+## v2.0.3 (2021-07-25)
+
+Changes:
+
+- Fix loading photos when editing existing card
+
 ## v2.0.2 (2021-07-25)
 
 Changes:

app/build.gradle

@@ -18,8 +18,8 @@ android {
         applicationId "me.hackerchick.catima"
         minSdkVersion 19
         targetSdkVersion 30
-        versionCode 72
-        versionName "2.0.2"
+        versionCode 74
+        versionName "2.0.4"
 
         vectorDrawables.useSupportLibrary true
     }
@@ -69,11 +69,11 @@ android {
 
 dependencies {
 // AndroidX
-    implementation 'androidx.appcompat:appcompat:1.2.0'
+    implementation 'androidx.appcompat:appcompat:1.3.0'
     implementation 'androidx.cardview:cardview:1.0.0'
     implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
     implementation 'androidx.preference:preference:1.1.1'
-    implementation 'com.google.android.material:material:1.3.0'
+    implementation 'com.google.android.material:material:1.4.0'
 
 // Third-party
     implementation 'com.journeyapps:zxing-android-embedded:4.1.0@aar'
@@ -90,7 +90,7 @@ dependencies {
     implementation 'io.wcm.tooling.spotbugs:io.wcm.tooling.spotbugs.annotations:1.0.0'
 
 // Testing
-    testImplementation 'androidx.test:core:1.3.0'
+    testImplementation 'androidx.test:core:1.4.0'
     testImplementation 'junit:junit:4.13.2'
     testImplementation 'org.robolectric:robolectric:4.4'
 }

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

@@ -2,8 +2,8 @@ package protect.card_locker;
 
 import android.content.Intent;
 import android.database.Cursor;
+import android.graphics.Bitmap;
 import android.os.Bundle;
-import android.os.Parcelable;
 import android.util.Log;
 import android.view.View;
 import android.widget.Toast;
@@ -12,6 +12,8 @@ import com.google.android.material.floatingactionbutton.FloatingActionButton;
 
 import androidx.appcompat.app.AppCompatActivity;
 import androidx.appcompat.widget.Toolbar;
+import androidx.recyclerview.widget.DefaultItemAnimator;
+import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 
 /**
@@ -47,6 +49,11 @@ public class CardShortcutConfigure extends AppCompatActivity implements LoyaltyC
         }
 
         final RecyclerView cardList = findViewById(R.id.list);
+
+        RecyclerView.LayoutManager mLayoutManager = new LinearLayoutManager(getApplicationContext());
+        cardList.setLayoutManager(mLayoutManager);
+        cardList.setItemAnimator(new DefaultItemAnimator());
+
         cardList.setVisibility(View.VISIBLE);
 
         Cursor cardCursor = db.getLoyaltyCardCursor();
@@ -72,11 +79,12 @@ public class CardShortcutConfigure extends AppCompatActivity implements LoyaltyC
         bundle.putBoolean("view", true);
         shortcutIntent.putExtras(bundle);
 
-        Parcelable icon = Intent.ShortcutIconResource.fromContext(CardShortcutConfigure.this, R.mipmap.ic_launcher);
+        Bitmap iconBitmap = Utils.generateIcon(CardShortcutConfigure.this, loyaltyCard, true).getLetterTile();
+
         Intent intent = new Intent();
         intent.putExtra(Intent.EXTRA_SHORTCUT_INTENT, shortcutIntent);
         intent.putExtra(Intent.EXTRA_SHORTCUT_NAME, loyaltyCard.store);
-        intent.putExtra(Intent.EXTRA_SHORTCUT_ICON_RESOURCE, icon);
+        intent.putExtra(Intent.EXTRA_SHORTCUT_ICON, iconBitmap);
         setResult(RESULT_OK, intent);
 
         finish();

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

@@ -220,23 +220,20 @@ public class ImportExportActivity extends AppCompatActivity
     }
 
     @Override
-    public void onRequestPermissionsResult(int requestCode, String permissions[], int[] grantResults)
-    {
-        if(requestCode == PERMISSIONS_EXTERNAL_STORAGE)
-        {
+    public void onRequestPermissionsResult(int requestCode, String permissions[], int[] grantResults) {
+        super.onRequestPermissionsResult(requestCode, permissions, grantResults);
+
+        if (requestCode == PERMISSIONS_EXTERNAL_STORAGE) {
             // If request is cancelled, the result arrays are empty.
             boolean success = grantResults.length > 0;
 
-            for(int grant : grantResults)
-            {
-                if(grant != PackageManager.PERMISSION_GRANTED)
-                {
+            for (int grant : grantResults) {
+                if (grant != PackageManager.PERMISSION_GRANTED) {
                     success = false;
                 }
             }
 
-            if(!success)
-            {
+            if (!success) {
                 // External storage permission rejected, inform user that
                 // import/export is prevented
                 Toast.makeText(getApplicationContext(), R.string.noExternalStoragePermissionError,

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

@@ -11,7 +11,6 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.io.OutputStreamWriter;
-import java.nio.charset.Charset;
 import java.nio.charset.StandardCharsets;
 
 import protect.card_locker.importexport.DataFormat;

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

@@ -7,8 +7,6 @@ import com.google.zxing.BarcodeFormat;
 import java.math.BigDecimal;
 import java.util.Currency;
 import java.util.Date;
-import java.util.HashMap;
-import java.util.Map;
 
 import androidx.annotation.Nullable;
 

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

@@ -567,6 +567,8 @@ public class LoyaltyCardEditActivity extends AppCompatActivity
                     return;
                 }
                 setTitle(R.string.editCardTitle);
+                setCardImage(cardImageFront, Utils.retrieveCardImage(this, tempLoyaltyCard.id, true));
+                setCardImage(cardImageBack, Utils.retrieveCardImage(this, tempLoyaltyCard.id, false));
             } else if (importLoyaltyCardUri != null) {
                 try {
                     tempLoyaltyCard = importUriHelper.parse(importLoyaltyCardUri);
@@ -590,8 +592,6 @@ public class LoyaltyCardEditActivity extends AppCompatActivity
         cardIdFieldView.setText(tempLoyaltyCard.cardId);
         barcodeIdField.setText(tempLoyaltyCard.barcodeId != null ? tempLoyaltyCard.barcodeId : getString(R.string.sameAsCardId));
         barcodeTypeField.setText(tempLoyaltyCard.barcodeType != null ? tempLoyaltyCard.barcodeType.name() : getString(R.string.noBarcode));
-        setCardImage(cardImageFront, (Bitmap) cardImageFront.getTag());
-        setCardImage(cardImageBack, (Bitmap) cardImageBack.getTag());
 
         if(groupsChips.getChildCount() == 0)
         {
@@ -912,9 +912,7 @@ public class LoyaltyCardEditActivity extends AppCompatActivity
                 @Override
                 public void onColorSelected(int dialogId, int color)
                 {
-                    hasChanged = true;
-
-                    headingColorValue = color;
+                    updateTempState(LoyaltyCardField.headerColor, color);
 
                     generateIcon(storeFieldEdit.getText().toString());
                 }

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

@@ -5,6 +5,7 @@ import android.content.Context;
 import android.content.Intent;
 import android.content.pm.ShortcutInfo;
 import android.content.pm.ShortcutManager;
+import android.graphics.Bitmap;
 import android.graphics.drawable.Icon;
 import android.os.Build;
 
@@ -37,6 +38,8 @@ class ShortcutHelper
             ShortcutManager shortcutManager = context.getSystemService(ShortcutManager.class);
             LinkedList<ShortcutInfo> list = new LinkedList<>(shortcutManager.getDynamicShortcuts());
 
+            DBHelper dbHelper = new DBHelper(context);
+
             String shortcutId = Integer.toString(card.id);
 
             // Sort the shortcuts by rank, so working with the relative order will be easier.
@@ -105,6 +108,14 @@ class ShortcutHelper
 
                 Intent shortcutIntent = prevShortcut.getIntent();
 
+                Bitmap iconBitmap = Utils.generateIcon(context, dbHelper.getLoyaltyCard(Integer.parseInt(prevShortcut.getId())), true).getLetterTile();
+                Icon icon;
+                if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.O) {
+                    icon = Icon.createWithAdaptiveBitmap(iconBitmap);
+                } else {
+                    icon = Icon.createWithBitmap(iconBitmap);
+                }
+
                 // Prevent instances of the view activity from piling up; if one exists let this
                 // one replace it.
                 shortcutIntent.setFlags(shortcutIntent.getFlags() | Intent.FLAG_ACTIVITY_SINGLE_TOP);
@@ -113,7 +124,7 @@ class ShortcutHelper
                         .setShortLabel(prevShortcut.getShortLabel())
                         .setLongLabel(prevShortcut.getLongLabel())
                         .setIntent(shortcutIntent)
-                        .setIcon(Icon.createWithResource(context, R.drawable.circle))
+                        .setIcon(icon)
                         .setRank(index)
                         .build();
 

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

@@ -9,7 +9,6 @@ import android.graphics.Color;
 import android.graphics.Matrix;
 import android.media.ExifInterface;
 import android.provider.MediaStore;
-import android.util.Base64;
 import android.util.Log;
 import android.widget.Toast;
 
@@ -33,7 +32,6 @@ import java.util.Currency;
 import java.util.Date;
 import java.util.GregorianCalendar;
 import java.util.HashMap;
-import java.util.List;
 
 import androidx.core.graphics.ColorUtils;
 
@@ -54,6 +52,10 @@ public class Utils {
 
     static final int BITMAP_SIZE_BIG = 512;
 
+    static public LetterBitmap generateIcon(Context context, LoyaltyCard loyaltyCard, boolean forShortcut) {
+        return generateIcon(context, loyaltyCard.store, loyaltyCard.headerColor, forShortcut);
+    }
+
     static public LetterBitmap generateIcon(Context context, String store, Integer backgroundColor) {
         return generateIcon(context, store, backgroundColor, false);
     }

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

@@ -12,7 +12,6 @@ import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.InputStreamReader;
 import java.io.Reader;
-import java.nio.charset.Charset;
 import java.nio.charset.StandardCharsets;
 
 public class ZipUtils {

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

@@ -4,7 +4,6 @@ import android.content.Context;
 import android.database.Cursor;
 import android.graphics.Bitmap;
 
-import net.lingala.zip4j.ZipFile;
 import net.lingala.zip4j.io.outputstream.ZipOutputStream;
 import net.lingala.zip4j.model.ZipParameters;
 import net.lingala.zip4j.util.InternalZipConstants;
@@ -12,16 +11,13 @@ import net.lingala.zip4j.util.InternalZipConstants;
 import org.apache.commons.csv.CSVFormat;
 import org.apache.commons.csv.CSVPrinter;
 
-import java.io.BufferedOutputStream;
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
-import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.io.OutputStreamWriter;
 import java.nio.charset.StandardCharsets;
-import java.util.zip.ZipEntry;
 
 import protect.card_locker.DBHelper;
 import protect.card_locker.Group;

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

@@ -4,7 +4,6 @@ import android.content.Context;
 
 import java.io.IOException;
 import java.io.OutputStream;
-import java.io.OutputStreamWriter;
 
 import protect.card_locker.DBHelper;
 

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

@@ -5,7 +5,6 @@ import android.util.Log;
 
 import java.io.IOException;
 import java.io.OutputStream;
-import java.io.OutputStreamWriter;
 
 import protect.card_locker.DBHelper;
 

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

@@ -3,7 +3,6 @@ package protect.card_locker.importexport;
 import android.content.Context;
 import android.database.sqlite.SQLiteDatabase;
 import android.graphics.Bitmap;
-import android.graphics.BitmapFactory;
 
 import com.google.zxing.BarcodeFormat;
 
@@ -14,14 +13,9 @@ import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
 
-import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.Reader;
 import java.math.BigDecimal;
-import java.nio.charset.Charset;
-import java.nio.charset.StandardCharsets;
 import java.text.ParseException;
 import java.util.ArrayList;
 import java.util.HashMap;

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

@@ -113,6 +113,6 @@
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toTopOf="parent"
-        app:tint="@android:color/black" />
+        app:tint="#000000" />
 
     </androidx.constraintlayout.widget.ConstraintLayout>

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

@@ -53,7 +53,7 @@
                 android:padding="0dp"
                 app:srcCompat="@drawable/ic_baseline_arrow_drop_up_24"
                 android:contentDescription="@string/moveBarcodeToTopOfScreen"
-                android:tint="@android:color/white"
+                app:tint="#ffffff"
                 android:background="@color/colorPrimary"
                 app:layout_constraintTop_toTopOf="parent"
                 app:layout_constraintBottom_toTopOf="@+id/barcode"
@@ -84,7 +84,7 @@
                 android:padding="0dp"
                 app:srcCompat="@drawable/ic_baseline_arrow_drop_down_24"
                 android:contentDescription="@string/moveBarcodeToCenterOfScreen"
-                android:tint="@android:color/white"
+                app:tint="#ffffff"
                 android:background="@color/colorPrimary"
                 app:layout_constraintTop_toBottomOf="@+id/barcode"
                 app:layout_constraintEnd_toEndOf="parent"
@@ -150,7 +150,7 @@
             android:layout_gravity="top|start"
             android:background="@color/colorPrimary"
             android:scaleType="fitCenter"
-            android:tint="@android:color/white"
+            app:tint="#ffffff"
             app:srcCompat="@drawable/ic_baseline_arrow_drop_up_24" />
 
         <androidx.core.widget.NestedScrollView