Release Catima 2.2.1

Merge branch 'master' of github.com:TheLastProject/loyalty-card-locker
Fix flashing in ManageGroupsActivity
2025-12-25 16:17:53 -05:00 · 2021-08-07 13:28:02 +02:00 · 2021-08-07 13:16:35 +02:00 · 2021-08-07 13:16:21 +02:00 · 2021-08-07 05:54:03 +02:00 · 2021-08-07 02:41:29 +02:00
43 changed files with 4870 additions and 416 deletions
--- a/.github/workflows/android.yml
+++ b/.github/workflows/android.yml
@@ -14,10 +14,11 @@ jobs:
    steps:
    - uses: actions/checkout@v2
    - uses: gradle/wrapper-validation-action@v1
-    - name: set up JDK 1.8
-      uses: actions/setup-java@v1
+    - name: set up JDK 11
+      uses: actions/setup-java@v2
      with:
-        java-version: 1.8
+        distribution: 'adopt'
+        java-version: '11'
    - name: Build
      run: ./gradlew assembleRelease
    - name: Check lint
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,23 @@
 # Changelog

+## v2.2.1 (2021-08-07)
+
+Changes:
+
+- Improve Stocard importer
+- Fix importing Catima export with multiline note
+- Scale card title in acceptable range
+- Animation improvements
+
+## v2.2.0 (2021-08-02)
+
+Changes:
+
+- Make links in notes clickable
+- Pre-select group the user is currently in when creating a new card
+- Comma-separate group names in loyalty card view
+- Fix maximize button appearing on no barcode
+
 ## v2.1.0 (2021-08-01)

 Changes:
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -18,8 +18,8 @@ android {
        applicationId "me.hackerchick.catima"
        minSdkVersion 19
        targetSdkVersion 30
-        versionCode 75
-        versionName "2.1.0"
+        versionCode 77
+        versionName "2.2.1"

        vectorDrawables.useSupportLibrary true
        multiDexEnabled true
@@ -74,9 +74,9 @@ android {

 dependencies {
 // AndroidX
-    implementation 'androidx.appcompat:appcompat:1.3.0'
+    implementation 'androidx.appcompat:appcompat:1.3.1'
    implementation 'androidx.cardview:cardview:1.0.0'
-    implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
+    implementation 'androidx.constraintlayout:constraintlayout:2.1.0'
    implementation 'androidx.preference:preference:1.1.1'
    implementation 'com.google.android.material:material:1.4.0'
    coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.1.5'
@@ -86,7 +86,6 @@ dependencies {
    implementation 'com.google.zxing:core:3.4.1'
    implementation 'org.apache.commons:commons-csv:1.8'
    implementation 'com.jaredrummler:colorpicker:1.1.0'
-    implementation 'com.google.guava:guava:30.1.1-jre'
    implementation 'com.github.invissvenska:NumberPickerPreference:1.0.2'
    implementation 'net.lingala.zip4j:zip4j:2.8.0'

@@ -96,7 +95,7 @@ dependencies {
 // Testing
    testImplementation 'androidx.test:core:1.4.0'
    testImplementation 'junit:junit:4.13.2'
-    testImplementation 'org.robolectric:robolectric:4.4'
+    testImplementation 'org.robolectric:robolectric:4.6.1'
 }

 tasks.withType(SpotBugsTask) {
--- a/app/src/main/java/protect/card_locker/AboutActivity.java
+++ b/app/src/main/java/protect/card_locker/AboutActivity.java
@@ -37,7 +37,6 @@ public class AboutActivity extends AppCompatActivity
        final List<ThirdPartyInfo> USED_LIBRARIES = new ArrayList<>();
        USED_LIBRARIES.add(new ThirdPartyInfo("Color Picker", "https://github.com/jaredrummler/ColorPicker", "Apache 2.0"));
        USED_LIBRARIES.add(new ThirdPartyInfo("Commons CSV", "https://commons.apache.org/proper/commons-csv/", "Apache 2.0"));
-        USED_LIBRARIES.add(new ThirdPartyInfo("Guava", "https://github.com/google/guava", "Apache 2.0"));
        USED_LIBRARIES.add(new ThirdPartyInfo("NumberPickerPreference", "https://github.com/invissvenska/NumberPickerPreference", "GNU LGPL 3.0"));
        USED_LIBRARIES.add(new ThirdPartyInfo("Zip4j", "https://github.com/srikanth-lingala/zip4j", "Apache 2.0"));
        USED_LIBRARIES.add(new ThirdPartyInfo("ZXing", "https://github.com/zxing/zxing", "Apache 2.0"));
--- a/app/src/main/java/protect/card_locker/BarcodeSelectorActivity.java
+++ b/app/src/main/java/protect/card_locker/BarcodeSelectorActivity.java
@@ -16,12 +16,12 @@ import android.widget.ImageView;
 import android.widget.TextView;
 import android.widget.Toast;

-import com.google.common.collect.ImmutableMap;
 import com.google.zxing.BarcodeFormat;

 import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
+import java.util.HashMap;
 import java.util.LinkedList;
 import java.util.Map;

@@ -79,20 +79,19 @@ public class BarcodeSelectorActivity extends AppCompatActivity
            actionBar.setDisplayHomeAsUpEnabled(true);
        }

-        barcodeViewMap = ImmutableMap.<String, Pair<Integer, Integer>>builder()
-                .put(BarcodeFormat.AZTEC.name(), new Pair<>(R.id.aztecBarcode, R.id.aztecBarcodeText))
-                .put(BarcodeFormat.CODE_39.name(), new Pair<>(R.id.code39Barcode, R.id.code39BarcodeText))
-                .put(BarcodeFormat.CODE_128.name(), new Pair<>(R.id.code128Barcode, R.id.code128BarcodeText))
-                .put(BarcodeFormat.CODABAR.name(), new Pair<>(R.id.codabarBarcode, R.id.codabarBarcodeText))
-                .put(BarcodeFormat.DATA_MATRIX.name(), new Pair<>(R.id.datamatrixBarcode, R.id.datamatrixBarcodeText))
-                .put(BarcodeFormat.EAN_8.name(), new Pair<>(R.id.ean8Barcode, R.id.ean8BarcodeText))
-                .put(BarcodeFormat.EAN_13.name(), new Pair<>(R.id.ean13Barcode, R.id.ean13BarcodeText))
-                .put(BarcodeFormat.ITF.name(), new Pair<>(R.id.itfBarcode, R.id.itfBarcodeText))
-                .put(BarcodeFormat.PDF_417.name(), new Pair<>(R.id.pdf417Barcode, R.id.pdf417BarcodeText))
-                .put(BarcodeFormat.QR_CODE.name(), new Pair<>(R.id.qrcodeBarcode, R.id.qrcodeBarcodeText))
-                .put(BarcodeFormat.UPC_A.name(), new Pair<>(R.id.upcaBarcode, R.id.upcaBarcodeText))
-                .put(BarcodeFormat.UPC_E.name(), new Pair<>(R.id.upceBarcode, R.id.upceBarcodeText))
-                .build();
+        barcodeViewMap = new HashMap<>();
+        barcodeViewMap.put(BarcodeFormat.AZTEC.name(), new Pair<>(R.id.aztecBarcode, R.id.aztecBarcodeText));
+        barcodeViewMap.put(BarcodeFormat.CODE_39.name(), new Pair<>(R.id.code39Barcode, R.id.code39BarcodeText));
+        barcodeViewMap.put(BarcodeFormat.CODE_128.name(), new Pair<>(R.id.code128Barcode, R.id.code128BarcodeText));
+        barcodeViewMap.put(BarcodeFormat.CODABAR.name(), new Pair<>(R.id.codabarBarcode, R.id.codabarBarcodeText));
+        barcodeViewMap.put(BarcodeFormat.DATA_MATRIX.name(), new Pair<>(R.id.datamatrixBarcode, R.id.datamatrixBarcodeText));
+        barcodeViewMap.put(BarcodeFormat.EAN_8.name(), new Pair<>(R.id.ean8Barcode, R.id.ean8BarcodeText));
+        barcodeViewMap.put(BarcodeFormat.EAN_13.name(), new Pair<>(R.id.ean13Barcode, R.id.ean13BarcodeText));
+        barcodeViewMap.put(BarcodeFormat.ITF.name(), new Pair<>(R.id.itfBarcode, R.id.itfBarcodeText));
+        barcodeViewMap.put(BarcodeFormat.PDF_417.name(), new Pair<>(R.id.pdf417Barcode, R.id.pdf417BarcodeText));
+        barcodeViewMap.put(BarcodeFormat.QR_CODE.name(), new Pair<>(R.id.qrcodeBarcode, R.id.qrcodeBarcodeText));
+        barcodeViewMap.put(BarcodeFormat.UPC_A.name(), new Pair<>(R.id.upcaBarcode, R.id.upcaBarcodeText));
+        barcodeViewMap.put(BarcodeFormat.UPC_E.name(), new Pair<>(R.id.upceBarcode, R.id.upceBarcodeText));

        EditText cardId = findViewById(R.id.cardId);
        cardId.addTextChangedListener(new TextWatcher()
--- a/app/src/main/java/protect/card_locker/DBHelper.java
+++ b/app/src/main/java/protect/card_locker/DBHelper.java
@@ -754,6 +754,9 @@ public class DBHelper extends SQLiteOpenHelper
            db.endTransaction();
        }

+        // Reorder after delete to ensure no bad order IDs
+        reorderGroups(getGroups());
+
        return success;
    }

--- a/app/src/main/java/protect/card_locker/Group.java
+++ b/app/src/main/java/protect/card_locker/Group.java
@@ -5,16 +5,18 @@ import android.database.Cursor;
 public class Group
 {
    public final String _id;
+    public final int order;

-    public Group(final String _id)
-    {
+    public Group(final String _id, final int order) {
        this._id = _id;
+        this.order = order;
    }

    public static Group toGroup(Cursor cursor)
    {
        String _id = cursor.getString(cursor.getColumnIndexOrThrow(DBHelper.LoyaltyCardDbGroups.ID));
+        int order = cursor.getInt(cursor.getColumnIndexOrThrow(DBHelper.LoyaltyCardDbGroups.ORDER));

-        return new Group(_id);
+        return new Group(_id, order);
    }
 }
--- a/app/src/main/java/protect/card_locker/GroupCursorAdapter.java
+++ b/app/src/main/java/protect/card_locker/GroupCursorAdapter.java
@@ -5,52 +5,94 @@ import android.database.Cursor;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
-import android.widget.CursorAdapter;
 import android.widget.TextView;

+import androidx.annotation.NonNull;
+import androidx.appcompat.widget.AppCompatImageButton;
+import androidx.recyclerview.widget.RecyclerView;
 import protect.card_locker.preferences.Settings;

-class GroupCursorAdapter extends CursorAdapter
+class GroupCursorAdapter extends BaseCursorAdapter<GroupCursorAdapter.GroupListItemViewHolder>
 {
-    Settings settings;
-    DBHelper db;
+    Settings mSettings;
+    private Cursor mCursor;
+    private final Context mContext;
+    private final GroupCursorAdapter.GroupAdapterListener mListener;
+    DBHelper mDb;

-    public GroupCursorAdapter(Context context, Cursor cursor)
-    {
-        super(context, cursor, 0);
-        settings = new Settings(context);
+    public GroupCursorAdapter(Context inputContext, Cursor inputCursor, GroupCursorAdapter.GroupAdapterListener inputListener) {
+        super(inputCursor);
+        setHasStableIds(true);
+        mSettings = new Settings(inputContext);
+        mContext = inputContext;
+        mListener = inputListener;
+        mDb = new DBHelper(inputContext);

-        db = new DBHelper(context);
+        swapCursor(mCursor);
    }

-    // The newView method is used to inflate a new view and return it,
-    // you don't bind any data to the view at this point.
    @Override
-    public View newView(Context context, Cursor cursor, ViewGroup parent)
-    {
-        return LayoutInflater.from(context).inflate(R.layout.group_layout, parent, false);
+    public void swapCursor(Cursor inputCursor) {
+        super.swapCursor(inputCursor);
+        mCursor = inputCursor;
    }

-    // The bindView method is used to bind all data to a given view
-    // such as setting the text on a TextView.
+    @NonNull
    @Override
-    public void bindView(View view, Context context, Cursor cursor)
+    public GroupCursorAdapter.GroupListItemViewHolder onCreateViewHolder(ViewGroup inputParent, int inputViewType)
    {
-        // Find fields to populate in inflated template
-        TextView nameField = view.findViewById(R.id.name);
-        TextView countField = view.findViewById(R.id.cardCount);
+        View itemView = LayoutInflater.from(inputParent.getContext()).inflate(R.layout.group_layout, inputParent, false);
+        return new GroupCursorAdapter.GroupListItemViewHolder(itemView);
+    }

-        // Extract properties from cursor
-        Group group = Group.toGroup(cursor);
+    public Cursor getCursor()
+    {
+        return mCursor;
+    }

-        Integer groupCardCount = db.getGroupCardCount(group._id);
+    public void onBindViewHolder(GroupCursorAdapter.GroupListItemViewHolder inputHolder, Cursor inputCursor) {
+        Group group = Group.toGroup(inputCursor);

-        // Populate fields with extracted properties
-        nameField.setText(group._id);
+        inputHolder.mName.setText(group._id);

-        countField.setText(context.getResources().getQuantityString(R.plurals.groupCardCount, groupCardCount, groupCardCount));
+        int groupCardCount = mDb.getGroupCardCount(group._id);
+        inputHolder.mCardCount.setText(mContext.getResources().getQuantityString(R.plurals.groupCardCount, groupCardCount, groupCardCount));

-        nameField.setTextSize(settings.getFontSizeMax(settings.getMediumFont()));
-        countField.setTextSize(settings.getFontSizeMax(settings.getSmallFont()));
+        inputHolder.mName.setTextSize(mSettings.getFontSizeMax(mSettings.getMediumFont()));
+        inputHolder.mCardCount.setTextSize(mSettings.getFontSizeMax(mSettings.getSmallFont()));
+
+        applyClickEvents(inputHolder);
+    }
+
+    private void applyClickEvents(GroupListItemViewHolder inputHolder)
+    {
+        inputHolder.mMoveDown.setOnClickListener(view -> mListener.onMoveDownButtonClicked(inputHolder.itemView));
+        inputHolder.mMoveUp.setOnClickListener(view -> mListener.onMoveUpButtonClicked(inputHolder.itemView));
+        inputHolder.mEdit.setOnClickListener(view -> mListener.onEditButtonClicked(inputHolder.itemView));
+        inputHolder.mDelete.setOnClickListener(view -> mListener.onDeleteButtonClicked(inputHolder.itemView));
+    }
+
+    public interface GroupAdapterListener
+    {
+        void onMoveDownButtonClicked(View view);
+        void onMoveUpButtonClicked(View view);
+        void onEditButtonClicked(View view);
+        void onDeleteButtonClicked(View view);
+    }
+
+    public class GroupListItemViewHolder extends RecyclerView.ViewHolder
+    {
+        public TextView mName, mCardCount;
+        public AppCompatImageButton mMoveUp, mMoveDown, mEdit, mDelete;
+
+        public GroupListItemViewHolder(View inputView) {
+            super(inputView);
+            mName = inputView.findViewById(R.id.name);
+            mCardCount = inputView.findViewById(R.id.cardCount);
+            mMoveUp = inputView.findViewById(R.id.moveUp);
+            mMoveDown = inputView.findViewById(R.id.moveDown);
+            mEdit = inputView.findViewById(R.id.edit);
+            mDelete = inputView.findViewById(R.id.delete);
+        }
    }
 }
--- a/app/src/main/java/protect/card_locker/LoyaltyCardCursorAdapter.java
+++ b/app/src/main/java/protect/card_locker/LoyaltyCardCursorAdapter.java
@@ -39,14 +39,22 @@ public class LoyaltyCardCursorAdapter extends BaseCursorAdapter<LoyaltyCardCurso
    public LoyaltyCardCursorAdapter(Context inputContext, Cursor inputCursor, CardAdapterListener inputListener)
    {
        super(inputCursor);
+        setHasStableIds(true);
        mSettings = new Settings(inputContext);
-        mCursor = inputCursor;
        mContext = inputContext;
        mListener = inputListener;
        mSelectedItems = new SparseBooleanArray();
        mAnimationItemsIndex = new SparseBooleanArray();

        mDarkModeEnabled = MainActivity.isDarkModeEnabled(inputContext);
+
+        swapCursor(mCursor);
+    }
+
+    @Override
+    public void swapCursor(Cursor inputCursor) {
+        super.swapCursor(inputCursor);
+        mCursor = inputCursor;
    }

    @Override
@@ -111,53 +119,20 @@ public class LoyaltyCardCursorAdapter extends BaseCursorAdapter<LoyaltyCardCurso

    private void applyClickEvents(LoyaltyCardListItemViewHolder inputHolder, final int inputPosition)
    {
-        inputHolder.mThumbnailContainer.setOnClickListener(new View.OnClickListener()
-        {
-            @Override
-            public void onClick(View inputView)
-            {
-                mListener.onIconClicked(inputPosition);
-            }
+        inputHolder.mThumbnailContainer.setOnClickListener(inputView -> mListener.onIconClicked(inputPosition));
+        inputHolder.mRow.setOnClickListener(inputView -> mListener.onRowClicked(inputPosition));
+        inputHolder.mInformationContainer.setOnClickListener(inputView -> mListener.onRowClicked(inputPosition));
+
+        inputHolder.mRow.setOnLongClickListener(inputView -> {
+            mListener.onRowLongClicked(inputPosition);
+            inputView.performHapticFeedback(HapticFeedbackConstants.LONG_PRESS);
+            return true;
        });

-        inputHolder.mRow.setOnClickListener(new View.OnClickListener()
-        {
-            @Override
-            public void onClick(View inputView)
-            {
-                mListener.onRowClicked(inputPosition);
-            }
-        });
-
-        inputHolder.mInformationContainer.setOnClickListener(new View.OnClickListener()
-        {
-            @Override
-            public void onClick(View inputView)
-            {
-                mListener.onRowClicked(inputPosition);
-            }
-        });
-
-        inputHolder.mRow.setOnLongClickListener(new View.OnLongClickListener()
-        {
-            @Override
-            public boolean onLongClick(View inputView)
-            {
-                mListener.onRowLongClicked(inputPosition);
-                inputView.performHapticFeedback(HapticFeedbackConstants.LONG_PRESS);
-                return true;
-            }
-        });
-
-        inputHolder.mInformationContainer.setOnLongClickListener(new View.OnLongClickListener()
-        {
-            @Override
-            public boolean onLongClick(View inputView)
-            {
-                mListener.onRowLongClicked(inputPosition);
-                inputView.performHapticFeedback(HapticFeedbackConstants.LONG_PRESS);
-                return true;
-            }
+        inputHolder.mInformationContainer.setOnLongClickListener(inputView -> {
+            mListener.onRowLongClicked(inputPosition);
+            inputView.performHapticFeedback(HapticFeedbackConstants.LONG_PRESS);
+            return true;
        });
    }

--- a/app/src/main/java/protect/card_locker/LoyaltyCardEditActivity.java
+++ b/app/src/main/java/protect/card_locker/LoyaltyCardEditActivity.java
@@ -50,7 +50,6 @@ import java.io.File;
 import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.io.InvalidObjectException;
-import java.lang.reflect.Field;
 import java.math.BigDecimal;
 import java.text.DateFormat;
 import java.util.ArrayList;
@@ -63,7 +62,6 @@ import java.util.Iterator;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Locale;
-import java.util.Map;
 import java.util.NoSuchElementException;
 import java.util.concurrent.Callable;

@@ -87,6 +85,13 @@ public class LoyaltyCardEditActivity extends AppCompatActivity
    private static final int PERMISSION_REQUEST_CAMERA_IMAGE_FRONT = 100;
    private static final int PERMISSION_REQUEST_CAMERA_IMAGE_BACK = 101;

+    public static final String BUNDLE_ID = "id";
+    public static final String BUNDLE_UPDATE = "update";
+    public static final String BUNDLE_CARDID = "cardId";
+    public static final String BUNDLE_BARCODEID = "barcodeId";
+    public static final String BUNDLE_BARCODETYPE = "barcodeType";
+    public static final String BUNDLE_ADDGROUP = "addGroup";
+
    TabLayout tabs;

    ImageView thumbnail;
@@ -114,9 +119,9 @@ public class LoyaltyCardEditActivity extends AppCompatActivity
    String cardId;
    String barcodeId;
    String barcodeType;
+    String addGroup;

    Uri importLoyaltyCardUri = null;
-    Integer headingColorValue = null;

    DBHelper db;
    ImportURIHelper importUriHelper;
@@ -161,12 +166,13 @@ public class LoyaltyCardEditActivity extends AppCompatActivity
    private void extractIntentFields(Intent intent)
    {
        final Bundle b = intent.getExtras();
-        loyaltyCardId = b != null ? b.getInt("id") : 0;
-        updateLoyaltyCard = b != null && b.getBoolean("update", false);
+        loyaltyCardId = b != null ? b.getInt(BUNDLE_ID) : 0;
+        updateLoyaltyCard = b != null && b.getBoolean(BUNDLE_UPDATE, false);

-        cardId = b != null ? b.getString("cardId") : null;
-        barcodeId = b != null ? b.getString("barcodeId") : null;
-        barcodeType = b != null ? b.getString("barcodeType") : null;
+        cardId = b != null ? b.getString(BUNDLE_CARDID) : null;
+        barcodeId = b != null ? b.getString(BUNDLE_BARCODEID) : null;
+        barcodeType = b != null ? b.getString(BUNDLE_BARCODETYPE) : null;
+        addGroup = b != null ? b.getString(BUNDLE_ADDGROUP) : null;

        importLoyaltyCardUri = intent.getData();

@@ -597,13 +603,18 @@ public class LoyaltyCardEditActivity extends AppCompatActivity
                chip.setText(group._id);
                chip.setTag(group);

-                chip.setChecked(false);
-                for (Group loyaltyCardGroup : loyaltyCardGroups) {
-                    if (loyaltyCardGroup._id.equals(group._id)) {
-                        chip.setChecked(true);
-                        break;
+                if (group._id.equals(addGroup)) {
+                    chip.setChecked(true);
+                } else {
+                    chip.setChecked(false);
+                    for (Group loyaltyCardGroup : loyaltyCardGroups) {
+                        if (loyaltyCardGroup._id.equals(group._id)) {
+                            chip.setChecked(true);
+                            break;
+                        }
                    }
                }
+
                chip.setOnTouchListener((v, event) -> {
                    hasChanged = true;

@@ -824,7 +835,7 @@ public class LoyaltyCardEditActivity extends AppCompatActivity
        {
            Intent i = new Intent(getApplicationContext(), ScanActivity.class);
            final Bundle b = new Bundle();
-            b.putString("cardId", cardIdFieldView.getText().toString());
+            b.putString(LoyaltyCardEditActivity.BUNDLE_CARDID, cardIdFieldView.getText().toString());
            i.putExtras(b);
            startActivityForResult(i, Utils.BARCODE_SCAN);
        }
--- a/app/src/main/java/protect/card_locker/LoyaltyCardViewActivity.java
+++ b/app/src/main/java/protect/card_locker/LoyaltyCardViewActivity.java
@@ -8,6 +8,7 @@ import android.graphics.Color;
 import android.graphics.drawable.Drawable;
 import android.os.Build;
 import android.os.Bundle;
+import android.text.TextUtils;
 import android.util.DisplayMetrics;
 import android.util.Log;
 import android.util.TypedValue;
@@ -32,6 +33,7 @@ import com.google.zxing.BarcodeFormat;
 import java.io.UnsupportedEncodingException;
 import java.math.BigDecimal;
 import java.text.DateFormat;
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;

@@ -39,6 +41,7 @@ import androidx.annotation.NonNull;
 import androidx.appcompat.app.ActionBar;
 import androidx.appcompat.app.AppCompatActivity;
 import androidx.appcompat.content.res.AppCompatResources;
+import androidx.appcompat.widget.AppCompatTextView;
 import androidx.appcompat.widget.Toolbar;
 import androidx.constraintlayout.widget.Guideline;
 import androidx.core.graphics.drawable.DrawableCompat;
@@ -62,7 +65,7 @@ public class LoyaltyCardViewActivity extends AppCompatActivity
    TextView groupsView;
    TextView balanceView;
    TextView expiryView;
-    TextView storeName;
+    AppCompatTextView storeName;
    ImageButton maximizeButton;
    ImageView barcodeImage;
    ImageButton minimizeButton;
@@ -380,14 +383,13 @@ public class LoyaltyCardViewActivity extends AppCompatActivity
        List<Group> loyaltyCardGroups = db.getLoyaltyCardGroups(loyaltyCardId);

        if(loyaltyCardGroups.size() > 0) {
-            StringBuilder groupsString = new StringBuilder();
+            List<String> groupNames = new ArrayList<>();
            for (Group group : loyaltyCardGroups) {
-                groupsString.append(group._id);
-                groupsString.append(" ");
+                groupNames.add(group._id);
            }

            groupsView.setVisibility(View.VISIBLE);
-            groupsView.setText(getString(R.string.groupsList, groupsString.toString()));
+            groupsView.setText(getString(R.string.groupsList, TextUtils.join(", ", groupNames)));
            groupsView.setTextSize(settings.getFontSizeMax(settings.getMediumFont()));
        }
        else
@@ -428,6 +430,12 @@ public class LoyaltyCardViewActivity extends AppCompatActivity

        storeName.setText(loyaltyCard.store);
        storeName.setTextSize(settings.getFontSizeMax(settings.getLargeFont()));
+        TextViewCompat.setAutoSizeTextTypeUniformWithConfiguration(
+                storeName,
+                settings.getFontSizeMin(settings.getLargeFont()),
+                settings.getFontSizeMax(settings.getLargeFont()),
+                1,
+                TypedValue.COMPLEX_UNIT_DIP);

        int backgroundHeaderColor;
        if(loyaltyCard.headerColor != null)
--- a/app/src/main/java/protect/card_locker/MainActivity.java
+++ b/app/src/main/java/protect/card_locker/MainActivity.java
@@ -16,7 +16,6 @@ import android.view.Menu;
 import android.view.MenuItem;
 import android.view.MotionEvent;
 import android.view.View;
-import android.widget.TextView;
 import android.widget.Toast;

 import com.google.android.material.floatingactionbutton.FloatingActionButton;
@@ -47,6 +46,8 @@ public class MainActivity extends AppCompatActivity implements LoyaltyCardCursor
    protected String mFilter = "";
    protected int selectedTab = 0;
    private RecyclerView mCardList;
+    private View mHelpText;
+    private View mNoMatchingCardsText;

    private ActionMode.Callback mCurrentActionModeCallback = new ActionMode.Callback()
    {
@@ -109,8 +110,8 @@ public class MainActivity extends AppCompatActivity implements LoyaltyCardCursor

                Intent intent = new Intent(getApplicationContext(), LoyaltyCardEditActivity.class);
                Bundle bundle = new Bundle();
-                bundle.putInt("id", mAdapter.getSelectedItems().get(0).id);
-                bundle.putBoolean("update", true);
+                bundle.putInt(LoyaltyCardEditActivity.BUNDLE_ID, mAdapter.getSelectedItems().get(0).id);
+                bundle.putBoolean(LoyaltyCardEditActivity.BUNDLE_UPDATE, true);
                intent.putExtras(bundle);
                startActivity(intent);
                inputMode.finish();
@@ -180,8 +181,6 @@ public class MainActivity extends AppCompatActivity implements LoyaltyCardCursor
        Toolbar toolbar = findViewById(R.id.toolbar);
        setSupportActionBar(toolbar);

-        updateLoyaltyCardList(mFilter, null);
-
        TabLayout groupsTabLayout = findViewById(R.id.groups);
        groupsTabLayout.addOnTabSelectedListener(new TabLayout.OnTabSelectedListener() {
            @Override
@@ -218,13 +217,24 @@ public class MainActivity extends AppCompatActivity implements LoyaltyCardCursor
            }
        };

-        final View helpText = findViewById(R.id.helpText);
-        final View noMatchingCardsText = findViewById(R.id.noMatchingCardsText);
-        final View list = findViewById(R.id.list);
+        mHelpText = findViewById(R.id.helpText);
+        mNoMatchingCardsText = findViewById(R.id.noMatchingCardsText);
+        mCardList = findViewById(R.id.list);

-        helpText.setOnTouchListener(gestureTouchListener);
-        noMatchingCardsText.setOnTouchListener(gestureTouchListener);
-        list.setOnTouchListener(gestureTouchListener);
+        mHelpText.setOnTouchListener(gestureTouchListener);
+        mNoMatchingCardsText.setOnTouchListener(gestureTouchListener);
+        mCardList.setOnTouchListener(gestureTouchListener);
+
+        // Init card list
+        RecyclerView.LayoutManager mLayoutManager = new LinearLayoutManager(getApplicationContext());
+        mCardList.setLayoutManager(mLayoutManager);
+        mCardList.setItemAnimator(new DefaultItemAnimator());
+
+        mAdapter = new LoyaltyCardCursorAdapter(this, null, this);
+        mCardList.setAdapter(mAdapter);
+        registerForContextMenu(mCardList);
+
+        updateLoyaltyCardList(mFilter, null);

        /*
         * This was added for Huawei, but Huawei is just too much of a fucking pain.
@@ -306,8 +316,13 @@ public class MainActivity extends AppCompatActivity implements LoyaltyCardCursor

        FloatingActionButton addButton = findViewById(R.id.fabAdd);
        addButton.setOnClickListener(v -> {
-            Intent i = new Intent(getApplicationContext(), ScanActivity.class);
-            startActivityForResult(i, Utils.BARCODE_SCAN);
+            Intent intent = new Intent(getApplicationContext(), ScanActivity.class);
+            Bundle bundle = new Bundle();
+            if (selectedTab != 0) {
+                bundle.putString(LoyaltyCardEditActivity.BUNDLE_ADDGROUP, groupsTabLayout.getTabAt(selectedTab).getText().toString());
+            }
+            intent.putExtras(bundle);
+            startActivityForResult(intent, Utils.BARCODE_SCAN);
        });
        addButton.bringToFront();
    }
@@ -335,8 +350,12 @@ public class MainActivity extends AppCompatActivity implements LoyaltyCardCursor
        if(!barcodeValues.isEmpty()) {
            Intent newIntent = new Intent(getApplicationContext(), LoyaltyCardEditActivity.class);
            Bundle newBundle = new Bundle();
-            newBundle.putString("barcodeType", barcodeValues.format());
-            newBundle.putString("cardId", barcodeValues.content());
+            newBundle.putString(LoyaltyCardEditActivity.BUNDLE_BARCODETYPE, barcodeValues.format());
+            newBundle.putString(LoyaltyCardEditActivity.BUNDLE_CARDID, barcodeValues.content());
+            Bundle inputBundle = intent.getExtras();
+            if (inputBundle != null && inputBundle.getString(LoyaltyCardEditActivity.BUNDLE_ADDGROUP) != null) {
+                newBundle.putString(LoyaltyCardEditActivity.BUNDLE_ADDGROUP, inputBundle.getString(LoyaltyCardEditActivity.BUNDLE_ADDGROUP));
+            }
            newIntent.putExtras(newBundle);
            startActivity(newIntent);
        }
@@ -375,20 +394,7 @@ public class MainActivity extends AppCompatActivity implements LoyaltyCardCursor
            group = (Group) tag;
        }

-        mCardList = findViewById(R.id.list);
-        RecyclerView.LayoutManager mLayoutManager = new LinearLayoutManager(getApplicationContext());
-        mCardList.setLayoutManager(mLayoutManager);
-        mCardList.setItemAnimator(new DefaultItemAnimator());
-
-        final TextView helpText = findViewById(R.id.helpText);
-        final TextView noMatchingCardsText = findViewById(R.id.noMatchingCardsText);
-
-        Cursor cardCursor = mDB.getLoyaltyCardCursor(filterText, group);
-
-        mAdapter = new LoyaltyCardCursorAdapter(this, cardCursor, this);
-        mCardList.setAdapter(mAdapter);
-
-        registerForContextMenu(mCardList);
+        mAdapter.swapCursor(mDB.getLoyaltyCardCursor(filterText, group));

        if(mDB.getLoyaltyCardCount() > 0)
        {
@@ -396,21 +402,21 @@ public class MainActivity extends AppCompatActivity implements LoyaltyCardCursor
            // to ensure that the noMatchingCardsText doesn't end up being shown below
            // the keyboard
            mCardList.setVisibility(View.VISIBLE);
-            helpText.setVisibility(View.GONE);
+            mHelpText.setVisibility(View.GONE);
            if(mAdapter.getItemCount() > 0)
            {
-                noMatchingCardsText.setVisibility(View.GONE);
+                mNoMatchingCardsText.setVisibility(View.GONE);
            }
            else
            {
-                noMatchingCardsText.setVisibility(View.VISIBLE);
+                mNoMatchingCardsText.setVisibility(View.VISIBLE);
            }
        }
        else
        {
            mCardList.setVisibility(View.GONE);
-            helpText.setVisibility(View.VISIBLE);
-            noMatchingCardsText.setVisibility(View.GONE);
+            mHelpText.setVisibility(View.VISIBLE);
+            mNoMatchingCardsText.setVisibility(View.GONE);
        }

        if (mCurrentActionMode != null) {
@@ -673,7 +679,6 @@ public class MainActivity extends AppCompatActivity implements LoyaltyCardCursor
    @Override
    public void onRowClicked(int inputPosition)
    {
-
        if (mAdapter.getSelectedItemCount() > 0)
        {
            enableActionMode(inputPosition);
--- a/app/src/main/java/protect/card_locker/ManageGroupsActivity.java
+++ b/app/src/main/java/protect/card_locker/ManageGroupsActivity.java
@@ -1,7 +1,6 @@
 package protect.card_locker;

 import android.content.Context;
-import android.content.DialogInterface;
 import android.content.SharedPreferences;
 import android.database.Cursor;
 import android.os.Bundle;
@@ -10,8 +9,6 @@ import android.view.MenuItem;
 import android.view.View;
 import android.view.WindowManager;
 import android.widget.EditText;
-import android.widget.LinearLayout;
-import android.widget.ListView;
 import android.widget.TextView;

 import com.google.android.material.floatingactionbutton.FloatingActionButton;
@@ -22,12 +19,18 @@ import androidx.appcompat.app.ActionBar;
 import androidx.appcompat.app.AlertDialog;
 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;

-public class ManageGroupsActivity extends AppCompatActivity
+public class ManageGroupsActivity extends AppCompatActivity implements GroupCursorAdapter.GroupAdapterListener
 {
    private static final String TAG = "Catima";

-    private final DBHelper db = new DBHelper(this);
+    private final DBHelper mDb = new DBHelper(this);
+    private TextView mHelpText;
+    private RecyclerView mGroupList;
+    GroupCursorAdapter mAdapter;

    @Override
    protected void onCreate(Bundle savedInstanceState)
@@ -41,19 +44,28 @@ public class ManageGroupsActivity extends AppCompatActivity
        {
            actionBar.setDisplayHomeAsUpEnabled(true);
        }
-
-        updateGroupList();
    }

    @Override
    protected void onResume() {
        super.onResume();

-        updateGroupList();
-
        FloatingActionButton addButton = findViewById(R.id.fabAdd);
        addButton.setOnClickListener(v -> createGroup());
        addButton.bringToFront();
+
+        mGroupList = findViewById(R.id.list);
+        mHelpText = findViewById(R.id.helpText);
+
+        // Init group list
+        RecyclerView.LayoutManager mLayoutManager = new LinearLayoutManager(getApplicationContext());
+        mGroupList.setLayoutManager(mLayoutManager);
+        mGroupList.setItemAnimator(new DefaultItemAnimator());
+
+        mAdapter = new GroupCursorAdapter(this, null, this);
+        mGroupList.setAdapter(mAdapter);
+
+        updateGroupList();
    }

    @Override
@@ -63,27 +75,17 @@ public class ManageGroupsActivity extends AppCompatActivity

    private void updateGroupList()
    {
-        final ListView groupList = findViewById(R.id.list);
-        final TextView helpText = findViewById(R.id.helpText);
-        final DBHelper db = new DBHelper(this);
+        mAdapter.swapCursor(mDb.getGroupCursor());

-        if(db.getGroupCount() > 0)
-        {
-            groupList.setVisibility(View.VISIBLE);
-            helpText.setVisibility(View.GONE);
-        }
-        else
-        {
-            groupList.setVisibility(View.GONE);
-            helpText.setVisibility(View.VISIBLE);
+        if (mDb.getGroupCount() == 0) {
+            mGroupList.setVisibility(View.GONE);
+            mHelpText.setVisibility(View.VISIBLE);
+
+            return;
        }

-        Cursor groupCursor = db.getGroupCursor();
-
-        final GroupCursorAdapter adapter = new GroupCursorAdapter(this, groupCursor);
-        groupList.setAdapter(adapter);
-
-        registerForContextMenu(groupList);
+        mGroupList.setVisibility(View.VISIBLE);
+        mHelpText.setVisibility(View.GONE);
    }

    private void invalidateHomescreenActiveTab()
@@ -108,69 +110,6 @@ public class ManageGroupsActivity extends AppCompatActivity
        return super.onOptionsItemSelected(item);
    }

-    public void moveGroupUp(View view) {
-        moveGroup(view, true);
-    }
-
-    public void moveGroupDown(View view) {
-        moveGroup(view, false);
-    }
-
-    public void editGroup(View view) {
-        final String groupName = getGroupname(view);
-
-        AlertDialog.Builder builder = new AlertDialog.Builder(this);
-        builder.setTitle(R.string.enter_group_name);
-        final EditText input = new EditText(this);
-        input.setInputType(InputType.TYPE_CLASS_TEXT);
-        input.setText(groupName);
-        builder.setView(input);
-
-        builder.setPositiveButton(getString(R.string.ok), new DialogInterface.OnClickListener() {
-            @Override
-            public void onClick(DialogInterface dialog, int which) {
-                db.updateGroup(groupName, input.getText().toString());
-                updateGroupList();
-            }
-        });
-        builder.setNegativeButton(getString(R.string.cancel), new DialogInterface.OnClickListener() {
-            @Override
-            public void onClick(DialogInterface dialog, int which) {
-                dialog.cancel();
-            }
-        });
-        AlertDialog dialog = builder.create();
-        dialog.show();
-        dialog.getWindow().setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_STATE_ALWAYS_VISIBLE);
-        input.requestFocus();
-    }
-
-    public void deleteGroup(View view) {
-        final String groupName = getGroupname(view);
-
-        AlertDialog.Builder builder = new AlertDialog.Builder(this);
-        builder.setTitle(R.string.deleteConfirmationGroup);
-        builder.setMessage(groupName);
-
-        builder.setPositiveButton(getString(R.string.ok), new DialogInterface.OnClickListener() {
-            @Override
-            public void onClick(DialogInterface dialog, int which) {
-                db.deleteGroup(groupName);
-                updateGroupList();
-                // Delete may change ordering, so invalidate
-                invalidateHomescreenActiveTab();
-            }
-        });
-        builder.setNegativeButton(getString(R.string.cancel), new DialogInterface.OnClickListener() {
-            @Override
-            public void onClick(DialogInterface dialog, int which) {
-                dialog.cancel();
-            }
-        });
-        AlertDialog dialog = builder.create();
-        dialog.show();
-    }
-
    private void createGroup() {
        AlertDialog.Builder builder = new AlertDialog.Builder(this);
        builder.setTitle(R.string.enter_group_name);
@@ -178,51 +117,28 @@ public class ManageGroupsActivity extends AppCompatActivity
        input.setInputType(InputType.TYPE_CLASS_TEXT);
        builder.setView(input);

-        builder.setPositiveButton(getString(R.string.ok), new DialogInterface.OnClickListener() {
-            @Override
-            public void onClick(DialogInterface dialog, int which) {
-                db.insertGroup(input.getText().toString());
-                updateGroupList();
-            }
-        });
-        builder.setNegativeButton(getString(R.string.cancel), new DialogInterface.OnClickListener() {
-            @Override
-            public void onClick(DialogInterface dialog, int which) {
-                dialog.cancel();
-            }
+        builder.setPositiveButton(getString(R.string.ok), (dialog, which) -> {
+            mDb.insertGroup(input.getText().toString());
+            updateGroupList();
        });
+        builder.setNegativeButton(getString(R.string.cancel), (dialog, which) -> dialog.cancel());
        AlertDialog dialog = builder.create();
        dialog.show();
        dialog.getWindow().setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_STATE_ALWAYS_VISIBLE);
        input.requestFocus();
    }

-    private String getGroupname(View view) {
-        LinearLayout parentRow = (LinearLayout) view.getParent().getParent();
-        TextView groupNameTextView = parentRow.findViewById(R.id.name);
+    private String getGroupName(View view) {
+        TextView groupNameTextView = view.findViewById(R.id.name);
        return (String) groupNameTextView.getText();
    }

    private void moveGroup(View view, boolean up) {
-        final String groupName = getGroupname(view);
+        List<Group> groups = mDb.getGroups();
+        final String groupName = getGroupName(view);

-        List<Group> groups = db.getGroups();
-
-        int currentIndex = -1;
-        Integer newIndex;
-
-        // Get current index in group list
-        for (int i = 0; i < groups.size(); i++) {
-            if (groups.get(i)._id.equals(groupName)) {
-                currentIndex = i;
-
-                break;
-            }
-        }
-
-        if (currentIndex == -1) {
-            throw new IndexOutOfBoundsException();
-        }
+        int currentIndex = mDb.getGroup(groupName).order;
+        int newIndex;

        // Reinsert group in correct position
        if (up) {
@@ -240,7 +156,7 @@ public class ManageGroupsActivity extends AppCompatActivity
        groups.add(newIndex, group);

        // Update database
-        db.reorderGroups(groups);
+        mDb.reorderGroups(groups);

        // Update UI
        updateGroupList();
@@ -248,4 +164,56 @@ public class ManageGroupsActivity extends AppCompatActivity
        // Ordering may have changed, so invalidate
        invalidateHomescreenActiveTab();
    }
+
+    @Override
+    public void onMoveDownButtonClicked(View view) {
+        moveGroup(view, false);
+    }
+
+    @Override
+    public void onMoveUpButtonClicked(View view) {
+        moveGroup(view, true);
+    }
+
+    @Override
+    public void onEditButtonClicked(View view) {
+        final String groupName = getGroupName(view);
+
+        AlertDialog.Builder builder = new AlertDialog.Builder(this);
+        builder.setTitle(R.string.enter_group_name);
+        final EditText input = new EditText(this);
+        input.setInputType(InputType.TYPE_CLASS_TEXT);
+        input.setText(groupName);
+        builder.setView(input);
+
+        builder.setPositiveButton(getString(R.string.ok), (dialog, which) -> {
+            String newGroupName = input.getText().toString();
+            mDb.updateGroup(groupName, newGroupName);
+            updateGroupList();
+        });
+        builder.setNegativeButton(getString(R.string.cancel), (dialog, which) -> dialog.cancel());
+        AlertDialog dialog = builder.create();
+        dialog.show();
+        dialog.getWindow().setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_STATE_ALWAYS_VISIBLE);
+        input.requestFocus();
+    }
+
+    @Override
+    public void onDeleteButtonClicked(View view) {
+        final String groupName = getGroupName(view);
+
+        AlertDialog.Builder builder = new AlertDialog.Builder(this);
+        builder.setTitle(R.string.deleteConfirmationGroup);
+        builder.setMessage(groupName);
+
+        builder.setPositiveButton(getString(R.string.ok), (dialog, which) -> {
+            mDb.deleteGroup(groupName);
+            updateGroupList();
+            // Delete may change ordering, so invalidate
+            invalidateHomescreenActiveTab();
+        });
+        builder.setNegativeButton(getString(R.string.cancel), (dialog, which) -> dialog.cancel());
+        AlertDialog dialog = builder.create();
+        dialog.show();
+    }
 }
--- a/app/src/main/java/protect/card_locker/ScanActivity.java
+++ b/app/src/main/java/protect/card_locker/ScanActivity.java
@@ -36,11 +36,13 @@ public class ScanActivity extends AppCompatActivity {
    private DecoratedBarcodeView barcodeScannerView;

    private String cardId;
+    private String addGroup;
    private boolean torch = false;

    private void extractIntentFields(Intent intent) {
        final Bundle b = intent.getExtras();
-        cardId = b != null ? b.getString("cardId") : null;
+        cardId = b != null ? b.getString(LoyaltyCardEditActivity.BUNDLE_CARDID) : null;
+        addGroup = b != null ? b.getString(LoyaltyCardEditActivity.BUNDLE_ADDGROUP) : null;
        Log.d(TAG, "Scan activity: id=" + cardId);
    }

@@ -58,6 +60,9 @@ public class ScanActivity extends AppCompatActivity {

        extractIntentFields(getIntent());

+        findViewById(R.id.add_from_image).setOnClickListener(this::addFromImage);
+        findViewById(R.id.add_manually).setOnClickListener(this::addManually);
+
        barcodeScannerView = findViewById(R.id.zxing_barcode_scanner);

        // Even though we do the actual decoding with the barcodeScannerView
@@ -76,6 +81,9 @@ public class ScanActivity extends AppCompatActivity {
                Bundle scanResultBundle = new Bundle();
                scanResultBundle.putString(BarcodeSelectorActivity.BARCODE_CONTENTS, result.getText());
                scanResultBundle.putString(BarcodeSelectorActivity.BARCODE_FORMAT, result.getBarcodeFormat().toString());
+                if (addGroup != null) {
+                    scanResultBundle.putString(LoyaltyCardEditActivity.BUNDLE_ADDGROUP, addGroup);
+                }
                scanResult.putExtras(scanResultBundle);
                ScanActivity.this.setResult(RESULT_OK, scanResult);
                finish();
@@ -167,6 +175,9 @@ public class ScanActivity extends AppCompatActivity {
            Bundle manualResultBundle = new Bundle();
            manualResultBundle.putString(BarcodeSelectorActivity.BARCODE_CONTENTS, barcodeValues.content());
            manualResultBundle.putString(BarcodeSelectorActivity.BARCODE_FORMAT, barcodeValues.format());
+            if (addGroup != null) {
+                manualResultBundle.putString(LoyaltyCardEditActivity.BUNDLE_ADDGROUP, addGroup);
+            }
            manualResult.putExtras(manualResultBundle);
            ScanActivity.this.setResult(RESULT_OK, manualResult);
            finish();
--- a/app/src/main/java/protect/card_locker/importexport/CatimaImporter.java
+++ b/app/src/main/java/protect/card_locker/importexport/CatimaImporter.java
@@ -21,6 +21,7 @@ import java.io.InputStreamReader;
 import java.io.StringReader;
 import java.math.BigDecimal;
 import java.nio.charset.StandardCharsets;
+import java.util.ArrayList;
 import java.util.Currency;
 import java.util.Date;
 import java.util.List;
@@ -142,18 +143,36 @@ public class CatimaImporter implements Importer
                String tmp = input.readLine();

                if (tmp == null || tmp.isEmpty()) {
+                    boolean sectionParsed = false;
+
                    switch (part) {
                        case 0:
                            // This is the version info, ignore
+                            sectionParsed = true;
                            break;
                        case 1:
-                            parseV2Groups(db, database, stringPart);
+                            try {
+                                parseV2Groups(db, database, stringPart);
+                                sectionParsed = true;
+                            } catch (FormatException e) {
+                                // We may have a multiline field, try again
+                            }
                            break;
                        case 2:
-                            parseV2Cards(context, db, database, stringPart);
+                            try {
+                                parseV2Cards(context, db, database, stringPart);
+                                sectionParsed = true;
+                            } catch (FormatException e) {
+                                // We may have a multiline field, try again
+                            }
                            break;
                        case 3:
-                            parseV2CardGroups(db, database, stringPart);
+                            try {
+                                parseV2CardGroups(db, database, stringPart);
+                                sectionParsed = true;
+                            } catch (FormatException e) {
+                                // We may have a multiline field, try again
+                            }
                            break;
                        default:
                            throw new FormatException("Issue parsing CSV data, too many parts for v2 parsing");
@@ -163,8 +182,12 @@ public class CatimaImporter implements Importer
                        break;
                    }

-                    part += 1;
-                    stringPart = "";
+                    if (sectionParsed) {
+                        part += 1;
+                        stringPart = "";
+                    } else {
+                        stringPart += tmp + "\n";
+                    }
                } else {
                    stringPart += tmp + "\n";
                }
@@ -183,9 +206,11 @@ public class CatimaImporter implements Importer
        // Parse groups
        final CSVParser groupParser = new CSVParser(new StringReader(data), CSVFormat.RFC4180.withHeader());

+        List<CSVRecord> records = new ArrayList<>();
+
        try {
            for (CSVRecord record : groupParser) {
-                importGroup(database, db, record);
+                records.add(record);

                if (Thread.currentThread().isInterrupted()) {
                    throw new InterruptedException();
@@ -196,6 +221,10 @@ public class CatimaImporter implements Importer
        } finally {
            groupParser.close();
        }
+
+        for (CSVRecord record : records) {
+            importGroup(database, db, record);
+        }
    }

    public void parseV2Cards(Context context, DBHelper db, SQLiteDatabase database, String data) throws IOException, FormatException, InterruptedException
@@ -203,9 +232,11 @@ public class CatimaImporter implements Importer
        // Parse cards
        final CSVParser cardParser = new CSVParser(new StringReader(data), CSVFormat.RFC4180.withHeader());

+        List<CSVRecord> records = new ArrayList<>();
+
        try {
            for (CSVRecord record : cardParser) {
-                importLoyaltyCard(context, database, db, record);
+                records.add(record);

                if (Thread.currentThread().isInterrupted()) {
                    throw new InterruptedException();
@@ -216,6 +247,10 @@ public class CatimaImporter implements Importer
        } finally {
            cardParser.close();
        }
+
+        for (CSVRecord record : records) {
+            importLoyaltyCard(context, database, db, record);
+        }
    }

    public void parseV2CardGroups(DBHelper db, SQLiteDatabase database, String data) throws IOException, FormatException, InterruptedException
@@ -223,9 +258,11 @@ public class CatimaImporter implements Importer
        // Parse card group mappings
        final CSVParser cardGroupParser = new CSVParser(new StringReader(data), CSVFormat.RFC4180.withHeader());

+        List<CSVRecord> records = new ArrayList<>();
+
        try {
            for (CSVRecord record : cardGroupParser) {
-                importCardGroupMapping(database, db, record);
+                records.add(record);

                if (Thread.currentThread().isInterrupted()) {
                    throw new InterruptedException();
@@ -236,6 +273,10 @@ public class CatimaImporter implements Importer
        } finally {
            cardGroupParser.close();
        }
+
+        for (CSVRecord record : records) {
+            importCardGroupMapping(database, db, record);
+        }
    }

    /**
--- a/app/src/main/java/protect/card_locker/importexport/StocardImporter.java
+++ b/app/src/main/java/protect/card_locker/importexport/StocardImporter.java
@@ -9,20 +9,23 @@ import com.google.zxing.BarcodeFormat;
 import net.lingala.zip4j.io.inputstream.ZipInputStream;
 import net.lingala.zip4j.model.LocalFileHeader;

-import org.json.JSONArray;
+import org.apache.commons.csv.CSVFormat;
+import org.apache.commons.csv.CSVParser;
+import org.apache.commons.csv.CSVRecord;
 import org.json.JSONException;
 import org.json.JSONObject;

 import java.io.IOException;
 import java.io.InputStream;
+import java.io.InputStreamReader;
 import java.math.BigDecimal;
+import java.nio.charset.StandardCharsets;
 import java.text.ParseException;
-import java.util.ArrayList;
 import java.util.HashMap;
-import java.util.List;

 import protect.card_locker.DBHelper;
 import protect.card_locker.FormatException;
+import protect.card_locker.R;
 import protect.card_locker.Utils;
 import protect.card_locker.ZipUtils;

@@ -37,7 +40,25 @@ public class StocardImporter implements Importer
 {
    public void importData(Context context, DBHelper db, InputStream input, char[] password) throws IOException, FormatException, JSONException, ParseException {
        HashMap<String, HashMap<String, Object>> loyaltyCardHashMap = new HashMap<>();
-        HashMap<String, String> providers = new HashMap<>();
+        HashMap<String, HashMap<String, String>> providers = new HashMap<>();
+
+        final CSVParser parser = new CSVParser(new InputStreamReader(context.getResources().openRawResource(R.raw.stocard_stores), StandardCharsets.UTF_8), CSVFormat.RFC4180.withHeader());
+
+        try
+        {
+            for (CSVRecord record : parser)
+            {
+                HashMap<String, String> recordData = new HashMap<>();
+                recordData.put("name", record.get("name"));
+                recordData.put("barcodeFormat", record.get("barcodeFormat"));
+
+                providers.put(record.get("_id"), recordData);
+            }
+
+            parser.close();
+        } catch(IllegalArgumentException|IllegalStateException e) {
+            throw new FormatException("Issue parsing CSV data", e);
+        }

        ZipInputStream zipInputStream = new ZipInputStream(input, password);

@@ -68,9 +89,7 @@ public class StocardImporter implements Importer
                };
            }

-            if (startsWith(nameParts, providersFileName, 0) && !localFileHeader.isDirectory()) {
-                providers = parseProviders(zipInputStream);
-            } else if (startsWith(nameParts, cardBaseName, 1)) {
+            if (startsWith(nameParts, cardBaseName, 1)) {
                // Extract cardName
                cardName = nameParts[cardBaseName.length].split("\\.", 2)[0];

@@ -139,10 +158,13 @@ public class StocardImporter implements Importer
        database.beginTransaction();

        for (HashMap<String, Object> loyaltyCardData : loyaltyCardHashMap.values()) {
-            String store = providers.get(loyaltyCardData.get("_providerId").toString());
+            String providerId = (String) loyaltyCardData.get("_providerId");
+            HashMap<String, String> providerData = providers.get(providerId);
+
+            String store = providerData != null ? providerData.get("name") : providerId;
            String note = (String) Utils.hashmapGetOrDefault(loyaltyCardData, "note", "");
            String cardId = (String) loyaltyCardData.get("cardId");
-            String barcodeTypeString = (String) Utils.hashmapGetOrDefault(loyaltyCardData, "barcodeType", null);
+            String barcodeTypeString = (String) Utils.hashmapGetOrDefault(loyaltyCardData, "barcodeType", providerData != null ? providerData.get("barcodeFormat") : null);
            BarcodeFormat barcodeType = null;
            if (barcodeTypeString != null) {
                if (barcodeTypeString.equals("RSS_DATABAR_EXPANDED")) {
@@ -194,33 +216,4 @@ public class StocardImporter implements Importer

        return loyaltyCardHashMap;
    }
-
-    private HashMap<String, String> parseProviders(ZipInputStream zipInputStream) throws IOException, JSONException {
-        // FIXME: This is probably completely wrong, but it works for the one and only test file I have
-        JSONObject jsonObject = ZipUtils.readJSON(zipInputStream);
-
-        JSONArray providerIdList = jsonObject.getJSONArray("provider_id_list");
-        JSONArray providerList = jsonObject.getJSONArray("provider_list");
-
-        // Resort, put IDs with - in them after IDs without any -
-        List<String> providerIds = new ArrayList<>();
-        List<String> customProviderIds = new ArrayList<>();
-
-        for (int i = 0; i < providerIdList.length(); i++) {
-            String providerId = providerIdList.get(i).toString();
-            if (providerId.contains("-")) {
-                customProviderIds.add(providerId);
-            } else {
-                providerIds.add(providerId);
-            }
-        }
-        providerIds.addAll(customProviderIds);
-
-        HashMap<String, String> providers = new HashMap<>();
-        for (int i = 0; i < jsonObject.getInt("number_of_cards"); i++) {
-            providers.put(providerIds.get(i), providerList.get(i).toString());
-        }
-
-        return providers;
-    }
 }
--- a/app/src/main/res/layout/custom_barcode_scanner.xml
+++ b/app/src/main/res/layout/custom_barcode_scanner.xml
@@ -30,14 +30,12 @@
            android:id="@+id/add_from_image"
            android:layout_width="wrap_content"
            android:layout_height="wrap_content"
-            android:onClick="addFromImage"
            android:text="@string/addFromImage" />

        <Button
            android:id="@+id/add_manually"
            android:layout_width="wrap_content"
            android:layout_height="wrap_content"
-            android:onClick="addManually"
            android:text="@string/addManually" />
    </LinearLayout>
 </merge>
--- a/app/src/main/res/layout/group_layout.xml
+++ b/app/src/main/res/layout/group_layout.xml
@@ -4,7 +4,7 @@
    xmlns:app="http://schemas.android.com/apk/res-auto"
    android:orientation="vertical"
    android:layout_width="match_parent"
-    android:layout_height="match_parent"
+    android:layout_height="wrap_content"
    android:gravity="center_vertical"
    android:baselineAligned="false"
    android:padding="@dimen/activity_margin">
@@ -44,8 +44,7 @@
            android:layout_weight="1"
            app:srcCompat="@drawable/ic_baseline_arrow_drop_up_24"
            android:contentDescription="@string/moveUp"
-            app:tint="@color/iconColor"
-            android:onClick="moveGroupUp"/>
+            app:tint="@color/iconColor"/>

        <ImageButton
            android:id="@+id/moveDown"
@@ -54,8 +53,7 @@
            android:layout_weight="1"
            app:srcCompat="@drawable/ic_baseline_arrow_drop_down_24"
            android:contentDescription="@string/moveDown"
-            app:tint="@color/iconColor"
-            android:onClick="moveGroupDown"/>
+            app:tint="@color/iconColor"/>

        <ImageButton
            android:id="@+id/edit"
@@ -64,8 +62,7 @@
            android:layout_weight="1"
            app:srcCompat="@drawable/ic_mode_edit_white_24dp"
            android:contentDescription="@string/edit"
-            app:tint="@color/iconColor"
-            android:onClick="editGroup" />
+            app:tint="@color/iconColor"/>

        <ImageButton
            android:id="@+id/delete"
@@ -74,8 +71,7 @@
            android:layout_weight="1"
            app:srcCompat="@drawable/ic_delete_white_24dp"
            android:contentDescription="@string/delete"
-            app:tint="@color/iconColor"
-            android:onClick="deleteGroup"/>
+            app:tint="@color/iconColor"/>

    </LinearLayout>

--- a/app/src/main/res/layout/group_main.xml
+++ b/app/src/main/res/layout/group_main.xml
@@ -17,9 +17,10 @@
        android:text="@string/noGroups"
        android:visibility="gone"/>

-    <ListView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
+    <androidx.recyclerview.widget.RecyclerView
        android:id="@+id/list"
-        android:visibility="gone"/>
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:scrollbars="vertical"
+        android:visibility="gone" />
 </RelativeLayout>
--- a/app/src/main/res/layout/loyalty_card_view_layout.xml
+++ b/app/src/main/res/layout/loyalty_card_view_layout.xml
@@ -45,6 +45,7 @@

            <ImageButton
                android:id="@+id/maximizeButton"
+                android:visibility="gone"
                android:layout_width="match_parent"
                android:layout_height="40dp"
                android:layout_marginStart="15.0dip"
@@ -219,6 +220,7 @@

                <TextView
                    android:id="@+id/noteView"
+                    android:autoLink="all"
                    android:layout_width="match_parent"
                    android:layout_height="wrap_content"
                    android:gravity="center"
@@ -273,7 +275,7 @@
            app:expandedTitleMarginEnd="64dp"
            app:contentScrim="?colorPrimary"
            app:expandedTitleGravity="top">
-            <TextView
+            <androidx.appcompat.widget.AppCompatTextView
                android:id="@+id/storeName"
                android:layout_width="match_parent"
                android:layout_height="wrap_content"
--- a/app/src/main/res/raw/readme.md
+++ b/app/src/main/res/raw/readme.md
@@ -0,0 +1,7 @@
+# stocard_stores.csv
+
+stocard_stores.csv was created by extracting /data/data/de.stocard/de.stocard.stocard/databases/stores on a rooted devices and running the following command over it:
+
+    sqlite3 -header -csv stores "select _id,name,barcodeFormat from stores" > stocard_stores.csv
+
+Only used for data portability reasons (ensuring importing works). Do NOT copy this anywhere else or use it for any purpose other than ensuring we can import a GDPR-provided export. We want to make sure this stays under fair use.
--- a/app/src/main/res/raw/stocard_stores.csv
+++ b/app/src/main/res/raw/stocard_stores.csv
--- a/app/src/main/res/values-cs/strings.xml
+++ b/app/src/main/res/values-cs/strings.xml
@@ -1,10 +1,8 @@
-<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">Přidat</string>
-
-    <string name="noGiftCards">ZAtím némáte žádné věrnostní karty. Klikněte na tlačítko "+" (plus) nahoře a začněte.\n\nLoyalty Card Locker umožňuje nosit své věrnostní karty v telefonu, takže jsou vždy na dosah.</string>
-    <string name="storeName">Obchod</string>
+    <string name="noGiftCards">Klepnutím na tlačítko + plus přidáte kartu nebo ji nejprve importujete z nabídky⋮.</string>
+    <string name="storeName">Název</string>
    <string name="note">Poznámka</string>
    <string name="cardId">ID karty</string>
    <string name="cancel">Zrušit</string>
@@ -14,42 +12,64 @@
    <string name="confirm">Potvrdit</string>
    <string name="ok">Ano</string>
    <string name="copy_to_clipboard">Kopírovat ID do schránky</string>
-    <string name="sendLabel">Odeslat&#8230;</string>
+    <string name="sendLabel">Odeslat…</string>
    <string name="editCardTitle">Editovat věrnostní kartu</string>
    <string name="addCardTitle">Přidat věrnostní kartu</string>
-    <string name="scanCardBarcode">Oskenujte kód karty</string>
-    <string name="barcodeImageDescription">Obrázek kódu karty</string>
-
-    <string name="noStoreError">Nebyl zadán Obchod</string>
-    <string name="noCardIdError">Nebylo zadáno ID karty</string>
+    <string name="scanCardBarcode">Skenování Čárový Kód Karty</string>
+    <string name="barcodeImageDescription">Obrázek čárového kódu karty</string>
+    <string name="noStoreError">Zadáno žádné jméno</string>
+    <string name="noCardIdError">Žádné ID karty zadáno</string>
    <string name="importExport">Import/Export</string>
    <string name="exportName">Export</string>
-    <string name="importExportHelp">Zálohování dat vám umožní přesunout vaše uložené karty na jiné zařízení.</string>
-    <string name="importSuccessfulTitle">Import proběhl úspěšně</string>
+    <string name="importExportHelp">Zálohování karet vám umožní přesunout je do jiného zařízení.</string>
+    <string name="importSuccessfulTitle">Dovážit</string>
    <string name="importFailedTitle">Import selhal</string>
-    <string name="importFailed">Import selhal</string>
-    <string name="exportSuccessfulTitle">Export proběhl úspěšně</string>
+    <string name="importFailed">Nelze importovat karty</string>
+    <string name="exportSuccessfulTitle">Exportovat</string>
    <string name="exportFailedTitle">Export selhal</string>
-    <string name="exportFailed">Export selhal</string>
-    <string name="importing">Importuji&#8230;</string>
-    <string name="exporting">Exportuji&#8230;</string>
-    <string name="noExternalStoragePermissionError">Nelze importovat nebo exportovat karty bez přístupu k externímu uložišti</string>
+    <string name="exportFailed">Nelze exportovat karty</string>
+    <string name="importing">Importuji…</string>
+    <string name="exporting">Exportuji…</string>
+    <string name="noExternalStoragePermissionError">Udělit povolení externího úložiště pro import nebo export karet jako první</string>
    <string name="importOptionFilesystemTitle">Import ze souborového systému</string>
    <string name="importOptionFilesystemExplanation">Vyberte konkrétní soubor v uložišti.</string>
    <string name="importOptionFilesystemButton">Ze souborového systému</string>
-    <string name="importOptionApplicationTitle">Použít externí aplikaci</string>
-    <string name="importOptionApplicationExplanation">K otevření souboru použije externí aplikaci jako Dropbox, Google Drive, nebo vámi preferovaný prohlížeč souborů.</string>
-    <string name="importOptionApplicationButton">Použít externí aplikaci</string>
-
+    <string name="importOptionApplicationTitle">Použijte jinou aplikaci</string>
+    <string name="importOptionApplicationExplanation">K otevření souboru použijte libovolnou aplikaci nebo svého oblíbeného správce souborů.</string>
+    <string name="importOptionApplicationButton">Použijte jinou aplikaci</string>
    <string name="about">O aplikaci</string>
-    <string name="app_license">Licensed under the GPLv3.</string>
+    <string name="app_license">Copylefted libre software, licencovaný 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>
-    <string name="app_revision_fmt">Revizní informace: <xliff:g id="app_revision_url">%s</xliff:g></string>
+    <string name="app_revision_fmt">Informace o revizi: <xliff:g id="app_revision_url">%s</xliff:g></string>
    <string name="selectBarcodeTitle">Vyberte čárový kód</string>
-    <string name="copy_to_clipboard_toast">ID karty zkopírováno do schránky</string>
-
-    <string name="deleteTitle">Odstzranit věrnostní kartu</string>
+    <string name="copy_to_clipboard_toast">ID karty zkopírované do schránky</string>
+    <string name="deleteTitle">Smazat kartu</string>
    <string name="deleteConfirmation">Opravdu chcete smazat tuto věrnostní kartu?</string>
-
-    </resources>
+    <string name="moveBarcodeToCenterOfScreen">Střed čárového kódu na obrazovce</string>
+    <string name="moveBarcodeToTopOfScreen">Přesuňte čárový kód do horní části obrazovky</string>
+    <string name="chooseExpiryDate">Zvolte datum vypršení platnosti</string>
+    <string name="never">Nikdy</string>
+    <string name="expiryDate">Platnost</string>
+    <string name="editBarcode">Upravit čárový kód</string>
+    <string name="barcode">Kód</string>
+    <string name="app_resources">Zdroje třetích stran Libre: <xliff:g id="app_resources_list">%s</xliff:g></string>
+    <string name="app_libraries">Libre knihovny třetích stran: <xliff:g id="app_libraries_list">%s</xliff:g></string>
+    <string name="app_copyright_old">Na základě Loyalty Card Keychain
+\ncopyright © 2016–2020 Branden Archer.</string>
+    <string name="exportOptionExplanation">Data budou zapsána na místo podle vašeho výběru.</string>
+    <string name="failedParsingImportUriError">Nelze analyzovat import URI</string>
+    <string name="noCardExistsError">Nelze najít kartu</string>
+    <string name="noCardsMessage">Nejprve přidejte kartu</string>
+    <string name="cardShortcut">Zástupce Karty</string>
+    <string name="share">Podíl</string>
+    <string name="unlockScreen">Odblokovat Rotaci</string>
+    <string name="lockScreen">Otáčení Bloku</string>
+    <string name="unstar">Odebrat z oblíbených</string>
+    <string name="star">Přidat do oblíbených</string>
+    <string name="noBarcode">Žádný čárový kód</string>
+    <string name="barcodeNoBarcode">Tato karta nemá čárový kód</string>
+    <string name="barcodeType">Typ čárového kódu</string>
+    <string name="noMatchingGiftCards">Nic jsem nenašel. Zkuste změnit vyhledávání.</string>
+    <string name="action_search">Vyhledávání</string>
+</resources>
--- a/app/src/main/res/values-da/strings.xml
+++ b/app/src/main/res/values-da/strings.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="scanCardBarcode">Scanne kortets stregkode</string>
+    <string name="addCardTitle">Tilføj kort</string>
+    <string name="editCardTitle">Rediger kort</string>
+    <string name="sendLabel">Afsend…</string>
+    <string name="share">Aktie</string>
+    <string name="copy_to_clipboard">Kopier ID til udklipsholder</string>
+    <string name="ok">OK</string>
+    <string name="deleteConfirmation">Slete dette kort permanent\?</string>
+    <plurals name="deleteCardsTitle">
+        <item quantity="one">Streichen <xliff:g>%d</xliff:g> kort</item>
+        <item quantity="other">Streichen <xliff:g>%d</xliff:g> korts</item>
+    </plurals>
+    <string name="deleteTitle">Karte streichen</string>
+    <string name="unlockScreen">Afbloker rotation</string>
+    <string name="lockScreen">Blokrotation</string>
+    <string name="confirm">Bekræft</string>
+    <string name="delete">Slet</string>
+    <string name="edit">Rediger</string>
+    <string name="save">Gem</string>
+    <string name="cancel">Annuller</string>
+    <string name="unstar">Fjern fra favoritter</string>
+    <string name="star">Føj til favoritter</string>
+    <string name="noBarcode">Ingen stregkode</string>
+    <string name="barcodeNoBarcode">Dette kort har ingen stregkode</string>
+    <string name="barcodeType">Stregkode type</string>
+    <string name="cardId">Kort ID</string>
+    <string name="note">Bemærk</string>
+    <string name="storeName">Navn</string>
+    <string name="noMatchingGiftCards">Jeg fandt ikke noget. Prøv at ændre din søgning.</string>
+    <string name="noGiftCards">Klik på + plus-knappen for at tilføje et kort, eller importer først nogle kort fra ⋮-menuen.</string>
+    <plurals name="selectedCardCount">
+        <item quantity="one"><xliff:g>%d</xliff:g> valgt kort</item>
+        <item quantity="other"><xliff:g>%d</xliff:g> valgte kort</item>
+    </plurals>
+    <string name="action_add">Tilføj</string>
+    <string name="action_search">Søg</string>
+</resources>
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -155,7 +155,7 @@
    <string name="frontImageDescription">Bild der Kartenvorderseite</string>
    <string name="backImageDescription">Bild der Kartenrückseite</string>
    <string name="passwordRequired">Bitte geben Sie das Passwort ein</string>
-    <string name="importStocardMessage">Wählen Sie Ihren <i>***-sync.zip</i>-Export aus Stocard zum Importieren aus, und wählen Sie anschließend die Strichcodetypen manuell aus.
+    <string name="importStocardMessage">Wählen Sie Ihren <i>***-sync.zip</i>-Export aus Stocard zum Importieren aus.
 \nOder Sie erhalten ihn, indem Sie eine E-Mail an support@stocardapp.com senden und um einen Export Ihrer Daten bitten.</string>
    <string name="importStocard">Von Stocard importieren</string>
    <string name="turn_flashlight_off">Taschenlampe ausschalten</string>
@@ -172,7 +172,7 @@
        <item quantity="other">Diese <xliff:g>%d</xliff:g> Karten endgültig löschen\?</item>
    </plurals>
    <plurals name="deleteCardsTitle">
-        <item quantity="one">Karte löschen</item>
-        <item quantity="other">Karten löschen</item>
+        <item quantity="one"><xliff:g>%d</xliff:g> Karte löschen</item>
+        <item quantity="other"><xliff:g>%d</xliff:g> Karten löschen</item>
    </plurals>
 </resources>
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -165,14 +165,14 @@
        <item quantity="one"><xliff:g>%d</xliff:g> tarjeta seleccionada</item>
        <item quantity="other"><xliff:g>%d</xliff:g> tarjetas seleccionadas</item>
    </plurals>
-    <string name="deleteTitle">Eliminar tarjeta</string>
+    <string name="deleteTitle">Eliminar la tarjeta</string>
    <string name="deleteConfirmation">¿Quiere eliminar esta tarjeta\?</string>
    <plurals name="deleteCardsConfirmation">
        <item quantity="one">¿Borrar esta tarjeta <xliff:g>%d</xliff:g> permanentemente\?</item>
        <item quantity="other">¿Borrar estas tarjetas <xliff:g>%d</xliff:g> permanentemente\?</item>
    </plurals>
    <plurals name="deleteCardsTitle">
-        <item quantity="one">Borrar la tarjeta</item>
-        <item quantity="other">Borrar las tarjetas</item>
+        <item quantity="one">Borrar <xliff:g>%d</xliff:g> tarjeta</item>
+        <item quantity="other">Borrar <xliff:g>%d</xliff:g> tarjetas</item>
    </plurals>
 </resources>
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -155,7 +155,7 @@
    <string name="backImageDescription">Image verso de la carte</string>
    <string name="frontImageDescription">Image recto de la carte</string>
    <string name="passwordRequired">Veuillez entrer le mot de passe</string>
-    <string name="importStocardMessage">Sélectionnez votre exportation <i>***-sync.zip</i> de Stocard pour l’importer, et sélectionnez les types de codes-barres manuellement par la suite.
+    <string name="importStocardMessage">Sélectionnez votre exportation <i>***-sync.zip</i> de Stocard pour l’importer.
 \nVous pouvez aussi l’obtenir en envoyant un courriel à support@stocardapp.com pour demander une exportation de vos données.</string>
    <string name="importStocard">Importer depuis Stocard</string>
    <string name="turn_flashlight_off">Éteindre la lampe de poche</string>
@@ -165,10 +165,14 @@
        <item quantity="one"><xliff:g>%d</xliff:g> carte sélectionnée</item>
        <item quantity="other"><xliff:g>%d</xliff:g> cartes sélectionnées</item>
    </plurals>
-    <string name="deleteTitle">Supprimer la carte de fidélité</string>
+    <string name="deleteTitle">Supprimer la carte</string>
    <string name="deleteConfirmation">Supprimer cette carte \?</string>
    <plurals name="deleteCardsConfirmation">
        <item quantity="one">Supprimer cette <xliff:g>%d</xliff:g> carte définitivement \?</item>
        <item quantity="other">Supprimer ces <xliff:g>%d</xliff:g> cartes définitivement \?</item>
    </plurals>
-</resources>
+    <plurals name="deleteCardsTitle">
+        <item quantity="one">Supprimer <xliff:g>%d</xliff:g> carte</item>
+        <item quantity="other">Supprimer <xliff:g>%d</xliff:g> cartes</item>
+    </plurals>
+</resources>
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -41,9 +41,9 @@
    <string name="importing">Importazione in corso…</string>
    <string name="exporting">Esportazione in corso…</string>
    <string name="noExternalStoragePermissionError">Concedi l\'autorizzazione all\'archiviazione esterna per importare o esportare prima le carte</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="importOptionFilesystemTitle">Importa dall\'archivio</string>
+    <string name="importOptionFilesystemExplanation">Scegli un file dall\'archivio.</string>
+    <string name="importOptionFilesystemButton">Dall\'archivio</string>
    <string name="importOptionApplicationTitle">Usa un’altra app</string>
    <string name="importOptionApplicationExplanation">Usa qualsiasi app o il tuo gestore di file preferito per aprire un file.</string>
    <string name="importOptionApplicationButton">Usa un’altra app</string>
@@ -155,7 +155,7 @@
    <string name="backImageDescription">Immagine posteriore della carta</string>
    <string name="frontImageDescription">Immagine frontale della carta</string>
    <string name="passwordRequired">Si prega di inserire la password</string>
-    <string name="importStocardMessage">Seleziona la tua esportazione <i>***-sync.zip</i> da Stocard per importare, e seleziona i tipi di codice a barre manualmente dopo.
+    <string name="importStocardMessage">Seleziona la tua esportazione <i>***-sync.zip</i> da Stocard per importare.
 \nOppure ottenerlo inviando un\'e-mail a support@stocardapp.com chiedendo un\'esportazione dei tuoi dati.</string>
    <string name="importStocard">Importa da Stocard</string>
    <string name="turn_flashlight_off">Spegni la torcia</string>
@@ -165,14 +165,14 @@
        <item quantity="one"><xliff:g>%d</xliff:g> carta selezionata</item>
        <item quantity="other"><xliff:g>%d</xliff:g> carte selezionate</item>
    </plurals>
-    <string name="deleteTitle">Rimuovi carta fedeltà</string>
+    <string name="deleteTitle">Rimuovi la carta</string>
    <string name="deleteConfirmation">Eliminare questa carta\?</string>
    <plurals name="deleteCardsConfirmation">
        <item quantity="one">Eliminare definitivamente questa scheda <xliff:g>%d</xliff:g>\?</item>
        <item quantity="other">Eliminare definitivamente queste schede <xliff:g>%d</xliff:g>\?</item>
    </plurals>
    <plurals name="deleteCardsTitle">
-        <item quantity="one">Elimina la carta</item>
-        <item quantity="other">Elimina le carte</item>
+        <item quantity="one">Elimina <xliff:g>%d</xliff:g> carta</item>
+        <item quantity="other">Elimina <xliff:g>%d</xliff:g> carte</item>
    </plurals>
 </resources>
--- a/app/src/main/res/values-lt/strings.xml
+++ b/app/src/main/res/values-lt/strings.xml
@@ -59,7 +59,7 @@
    <string name="failedParsingImportUriError">Nepavyko iššifruoti importo URI</string>
    <string name="turn_flashlight_off">Išjunkti žibintuvėlį</string>
    <string name="turn_flashlight_on">Įjunkti žibintuvėlį</string>
-    <string name="failedGeneratingShareURL">Nepavyko sugeneruoti bendrinamo URL. Praneškite apie šią klaidą!</string>
+    <string name="failedGeneratingShareURL">Nepavyko sugeneruoti bendrinamo URL. Praneškite apie tai.</string>
    <string name="passwordRequired">Įveskite slaptažodį</string>
    <string name="no">Ne</string>
    <string name="yes">Taip</string>
@@ -79,7 +79,7 @@
    <string name="setBarcodeId">Nustatyti brūkšninio kodo reikšmę</string>
    <string name="sameAsCardId">Tokia pat kaip kortelės ID</string>
    <string name="barcodeId">Brūkšninio kodo reikšmė</string>
-    <string name="importStocardMessage">Pasirinkite <i>***-sync.zip</i> eksportą iš Stocard, kad galėtumėte importuoti, o vėliau brūkšninių kodų tipus pasirinkite rankiniu būdu.
+    <string name="importStocardMessage">Pasirinkite <i>***-sync.zip</i> eksportą iš Stocard, kad galėtumėte importuoti.
 \nArba gaukite susisiekę el. paštu support@stocardapp.com, prašydami eksportuoti jūsų duomenis.</string>
    <string name="importStocard">Importuoti iš Stocard</string>
    <string name="importFidmeMessage">Pasirinkite <i>fidme-export-request-xxxxxx.zip</i> eksportą iš FidMe, kurį norite importuoti, ir po to brūkšninių kodų tipus pasirinkite rankiniu būdu.
@@ -169,4 +169,14 @@
    </plurals>
    <string name="deleteTitle">Panaikinti lojalumo kortelę</string>
    <string name="deleteConfirmation">Ištrinti šią kortelę\?</string>
+    <plurals name="deleteCardsConfirmation">
+        <item quantity="one">Ištrinti šią <xliff:g>%d</xliff:g> kortelę visam laikui\?</item>
+        <item quantity="few">Ištrinti šias <xliff:g>%d</xliff:g> korteles visam laikui\?</item>
+        <item quantity="other">Ištrinti šias <xliff:g>%d</xliff:g> kortelių visam laikui\?</item>
+    </plurals>
+    <plurals name="deleteCardsTitle">
+        <item quantity="one">Ištrinti <xliff:g>%d</xliff:g> kortelę</item>
+        <item quantity="few">Ištrinti <xliff:g>%d</xliff:g> korteles</item>
+        <item quantity="other">Ištrinti <xliff:g>%d</xliff:g> kortelių</item>
+    </plurals>
 </resources>
--- a/app/src/main/res/values-nb-rNO/strings.xml
+++ b/app/src/main/res/values-nb-rNO/strings.xml
@@ -154,7 +154,7 @@
    <string name="photos">Bilder</string>
    <string name="backImageDescription">Kortets bakside</string>
    <string name="frontImageDescription">Kortets forside</string>
-    <string name="importStocardMessage">Velg din <i>***-sync.zip</i>-eksport fra Stocard å importere, og velg strekkodetypene manuelt etterpå.
+    <string name="importStocardMessage">Velg din <i>***-sync.zip</i>-eksport fra Stocard å importere.
 \nEller få den ved å sende e-post til support@stocardapp.com der du etterspør eksport av dataen din.</string>
    <string name="passwordRequired">Skriv inn passordet</string>
    <string name="importStocard">Importer fra Stocard</string>
@@ -172,7 +172,7 @@
    <string name="turn_flashlight_off">Skru av lommelykten</string>
    <string name="deleteTitle">Fjern kundekort</string>
    <plurals name="deleteCardsTitle">
-        <item quantity="one">Slett kort</item>
-        <item quantity="other">Slett kort</item>
+        <item quantity="one">Slett <xliff:g xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">%d</xliff:g> kort</item>
+        <item quantity="other">Slett <xliff:g xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">%d</xliff:g> kort</item>
    </plurals>
-</resources>
+</resources>
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@@ -155,7 +155,7 @@
    <string name="backImageDescription">Achterzijde van de kaart</string>
    <string name="frontImageDescription">Voorzijde van de kaart</string>
    <string name="passwordRequired">Voer het wachtwoord in</string>
-    <string name="importStocardMessage">Kies het te importeren Stocard-exportbestand genaamd <i>***-sync.zip</i> en kies nadien de juiste barcodes.
+    <string name="importStocardMessage">Kies het te importeren Stocard-exportbestand genaamd <i>***-sync.zip</i>.
 \nOf stuur een e-mail naar support@stocardapp.com waarin je vraagt om een exportbestand.</string>
    <string name="importStocard">Importeren uit Stocard</string>
    <string name="failedGeneratingShareURL">De te delen link kan niet worden gegenereerd. Meld deze fout.</string>
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -156,7 +156,7 @@
    <string name="backImageDescription">Задняя сторона карты</string>
    <string name="frontImageDescription">Лицевая сторона карты</string>
    <string name="photos">Фотографии</string>
-    <string name="importStocardMessage">Выберите файл <i>***-sync.zip</i> для импортирования, а затем вручную укажите типы штрих-кодов.
+    <string name="importStocardMessage">Выберите файл <i>***-sync.zip</i> для импортирования.
 \nЭтот файл можно получить по электронной почте от support@stocardapp.com, предварительно запросив экспорт ваших данных.</string>
    <string name="passwordRequired">Введите пароль</string>
    <string name="importStocard">Импорт из Stocard</string>
@@ -177,4 +177,10 @@
        <item quantity="many">Удалить эти <xliff:g>%d</xliff:g> карт безвозвратно\?</item>
        <item quantity="other">Удалить эти <xliff:g>%d</xliff:g> карт безвозвратно\?</item>
    </plurals>
-</resources>
+    <plurals name="deleteCardsTitle">
+        <item quantity="one">Удаление <xliff:g>%d</xliff:g> карты</item>
+        <item quantity="few">Удаление <xliff:g>%d</xliff:g> карт</item>
+        <item quantity="many">Удаление <xliff:g>%d</xliff:g> карт</item>
+        <item quantity="other">Удаление <xliff:g>%d</xliff:g> карт</item>
+    </plurals>
+</resources>
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -188,7 +188,7 @@
    <string name="importLoyaltyCardKeychain">Import from Loyalty Card Keychain</string>
    <string name="importLoyaltyCardKeychainMessage">Select your <i>LoyaltyCardKeychain.csv</i> export from Loyalty Card Keychain to import.\nOr create it from the "Import/Export" menu in Loyalty Card Keychain by pressing "Export" there first.</string>
    <string name="importStocard">Import from Stocard</string>
-    <string name="importStocardMessage">Select your <i>***-sync.zip</i> export from Stocard to import, and select the barcode types manually afterwards.\nOr get it by e-mailing support@stocardapp.com asking for an export of your data.</string>
+    <string name="importStocardMessage">Select your <i>***-sync.zip</i> export from Stocard to import.\nOr get it by e-mailing support@stocardapp.com asking for an export of your data.</string>
    <string name="importVoucherVault">Import from Voucher Vault</string>
    <string name="importVoucherVaultMessage">Select your <i>vouchervault.json</i> export from Voucher Vault to import.\nOr create it by pressing "Export" in Voucher Vault first.</string>
    <string name="barcodeId">Barcode value</string>
--- a/app/src/test/java/protect/card_locker/ImportExportTest.java
+++ b/app/src/test/java/protect/card_locker/ImportExportTest.java
@@ -29,7 +29,6 @@ import java.io.FileNotFoundException;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
-import java.io.InputStreamReader;
 import java.io.OutputStreamWriter;
 import java.math.BigDecimal;
 import java.nio.charset.StandardCharsets;
@@ -981,7 +980,9 @@ public class ImportExportTest
                "1,Card 1,Note 1,1618053234,100,USD,1234,5432,1,QR_CODE,0,\r\n" +
                "8,Clothes Store,Note about store,,0,,a,,-5317,,0,\n" +
                "2,Department Store,,1618041729,0,,A,,-9977996,,0,\n" +
-                "3,Grocery Store,,,150,,dhd,,-9977996,,0,\n" +
+                "3,Grocery Store,\"Multiline note about grocery store\n" +
+                "\n" +
+                "with blank line\",,150,,dhd,,-9977996,,0,\n" +
                "4,Pharmacy,,,0,,dhshsvshs,,-10902850,,1,\n" +
                "5,Restaurant,Note about restaurant here,,0,,98765432,23456,-10902850,CODE_128,0,\n" +
                "6,Shoe Store,,,12.50,EUR,a,-5317,,AZTEC,0,\n" +
@@ -1066,7 +1067,7 @@ public class ImportExportTest
        LoyaltyCard card3 = db.getLoyaltyCard(3);

        assertEquals("Grocery Store", card3.store);
-        assertEquals("", card3.note);
+        assertEquals("Multiline note about grocery store\n\nwith blank line", card3.note);
        assertEquals(null, card3.expiry);
        assertEquals(new BigDecimal("150"), card3.balance);
        assertEquals(null, card3.balanceType);
@@ -1198,7 +1199,7 @@ public class ImportExportTest
        assertEquals(null, card.balanceType);
        assertEquals("55555", card.cardId);
        assertEquals(null, card.barcodeId);
-        assertEquals(null, card.barcodeType);
+        assertEquals(BarcodeFormat.EAN_13, card.barcodeType);
        assertEquals(0, card.starStatus);

        assertNull(Utils.retrieveCardImage(activity.getApplicationContext(), 1, true));
@@ -1213,7 +1214,7 @@ public class ImportExportTest
        assertEquals(null, card.balanceType);
        assertEquals("7649484", card.cardId);
        assertEquals(null, card.barcodeId);
-        assertEquals(null, card.barcodeType);
+        assertEquals(BarcodeFormat.EAN_13, card.barcodeType);
        assertEquals(0, card.starStatus);

        assertTrue(BitmapFactory.decodeStream(getClass().getResourceAsStream("stocard-front.jpg")).sameAs(Utils.retrieveCardImage(activity.getApplicationContext(), 2, true)));
@@ -1221,7 +1222,8 @@ public class ImportExportTest

        card = db.getLoyaltyCard(3);

-        assertEquals("jö", card.store);
+        // I don't think we can know this one, but falling back to an unique store name is at least something
+        assertEquals("63536738-d64b-48ae-aeb8-82761523fa67", card.store);
        assertEquals("", card.note);
        assertEquals(null, card.expiry);
        assertEquals(new BigDecimal("0"), card.balance);
--- a/app/src/test/java/protect/card_locker/LoyaltyCardCursorAdapterTest.java
+++ b/app/src/test/java/protect/card_locker/LoyaltyCardCursorAdapterTest.java
@@ -25,6 +25,8 @@ import java.util.Currency;
 import java.util.Date;

 import androidx.preference.PreferenceManager;
+import androidx.recyclerview.widget.DefaultItemAnimator;
+import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 import protect.card_locker.preferences.Settings;

@@ -61,8 +63,8 @@ public class LoyaltyCardCursorAdapterTest
    {
        LoyaltyCardCursorAdapter adapter = new LoyaltyCardCursorAdapter(activity.getApplicationContext(), cursor, (MainActivity) activity);

-        RecyclerView.ViewHolder viewHolder = adapter.createViewHolder(activity.findViewById(R.id.list), 0);
-        adapter.bindViewHolder((LoyaltyCardCursorAdapter.LoyaltyCardListItemViewHolder) viewHolder, cursor.getPosition());
+        LoyaltyCardCursorAdapter.LoyaltyCardListItemViewHolder viewHolder = adapter.createViewHolder(activity.findViewById(R.id.list), 0);
+        adapter.bindViewHolder(viewHolder, cursor.getPosition());

        return viewHolder.itemView;
    }
--- a/app/src/test/java/protect/card_locker/LoyaltyCardViewActivityTest.java
+++ b/app/src/test/java/protect/card_locker/LoyaltyCardViewActivityTest.java
@@ -1,7 +1,6 @@
 package protect.card_locker;

 import android.app.Activity;
-import androidx.appcompat.app.AlertDialog;
 import android.app.DatePickerDialog;
 import android.content.Context;
 import android.content.Intent;
@@ -43,7 +42,6 @@ import org.robolectric.RuntimeEnvironment;
 import org.robolectric.android.controller.ActivityController;
 import org.robolectric.annotation.Config;
 import org.robolectric.shadows.ShadowActivity;
-import org.robolectric.shadows.ShadowAlertDialog;
 import org.robolectric.shadows.ShadowDialog;
 import org.robolectric.shadows.ShadowLog;

@@ -54,6 +52,7 @@ import java.text.ParseException;
 import java.util.Currency;
 import java.util.Date;

+import androidx.appcompat.app.AlertDialog;
 import androidx.core.widget.TextViewCompat;
 import androidx.preference.PreferenceManager;

@@ -1158,7 +1157,6 @@ public class LoyaltyCardViewActivityTest

        TextViewCompat.getAutoSizeMaxTextSize(storeName);
        TextViewCompat.getAutoSizeMaxTextSize(storeName);
-        assertEquals(LARGE_FONT_SIZE, (int)storeName.getTextSize());
        assertEquals(LARGE_FONT_SIZE, TextViewCompat.getAutoSizeMaxTextSize(cardIdFieldView));

        shadowOf(activity).clickMenuItem(android.R.id.home);
@@ -1341,6 +1339,50 @@ public class LoyaltyCardViewActivityTest
        db.close();
    }

+    @Test
+    public void checkNoBarcodeFullscreenWorkflow()
+    {
+        ActivityController activityController = createActivityWithLoyaltyCard(false);
+
+        Activity activity = (Activity)activityController.get();
+        DBHelper db = TestHelpers.getEmptyDb(activity);
+        db.insertLoyaltyCard("store", "note", null, new BigDecimal("0"), null, BARCODE_DATA, null, null, Color.BLACK, 0);
+
+        activityController.start();
+        activityController.visible();
+        activityController.resume();
+
+        assertEquals(false, activity.isFinishing());
+
+        ImageView barcodeImage = activity.findViewById(R.id.barcode);
+        View collapsingToolbarLayout = activity.findViewById(R.id.collapsingToolbarLayout);
+        View bottomSheet = activity.findViewById(R.id.bottom_sheet);
+        ImageButton maximizeButton = activity.findViewById(R.id.maximizeButton);
+        ImageButton minimizeButton = activity.findViewById(R.id.minimizeButton);
+        FloatingActionButton editButton = activity.findViewById(R.id.fabEdit);
+        SeekBar barcodeScaler = activity.findViewById(R.id.barcodeScaler);
+
+        // Android should not be in fullscreen mode
+        int uiOptions = activity.getWindow().getDecorView().getSystemUiVisibility();
+        assertNotEquals(uiOptions | View.SYSTEM_UI_FLAG_IMMERSIVE_STICKY, uiOptions);
+        assertNotEquals(uiOptions | View.SYSTEM_UI_FLAG_FULLSCREEN, uiOptions);
+
+        // Elements should be visible (except minimize/maximize buttons and barcode and scaler)
+        assertEquals(View.VISIBLE, collapsingToolbarLayout.getVisibility());
+        assertEquals(View.VISIBLE, bottomSheet.getVisibility());
+        assertEquals(View.GONE, maximizeButton.getVisibility());
+        assertEquals(View.GONE, minimizeButton.getVisibility());
+        assertEquals(View.VISIBLE, editButton.getVisibility());
+        assertEquals(View.GONE, barcodeScaler.getVisibility());
+
+        // Pressing back when not in full screen should finish activity
+        activity.onBackPressed();
+        shadowOf(getMainLooper()).idle();
+        assertEquals(true, activity.isFinishing());
+
+        db.close();
+    }
+
    @Test
    public void importCard()
    {
--- a/app/src/test/java/protect/card_locker/TestHelpers.java
+++ b/app/src/test/java/protect/card_locker/TestHelpers.java
@@ -5,8 +5,6 @@ import android.database.Cursor;
 import android.database.sqlite.SQLiteDatabase;

 import java.io.FileNotFoundException;
-import java.util.ArrayList;
-import java.util.List;

 public class TestHelpers {
    static public DBHelper getEmptyDb(Activity activity) {
--- a/build.gradle
+++ b/build.gradle
@@ -9,7 +9,7 @@ buildscript {
    }

    dependencies {
-        classpath 'com.android.tools.build:gradle:4.2.2'
+        classpath 'com.android.tools.build:gradle:7.0.0'
        classpath 'gradle.plugin.com.github.spotbugs.snom:spotbugs-gradle-plugin:4.7.0'

        // NOTE: Do not place your application dependencies here; they belong
@@ -20,7 +20,6 @@ buildscript {
 allprojects {
    repositories {
        google()
-        jcenter()
        maven { url "https://jitpack.io" }
        gradlePluginPortal()
    }
--- a/fastlane/metadata/android/cs/short_description.txt
+++ b/fastlane/metadata/android/cs/short_description.txt
@@ -0,0 +1 @@
+Pro čárové kódy, členství, věrnostní programy, kupony a vstupenky.
--- a/fastlane/metadata/android/cs/title.txt
+++ b/fastlane/metadata/android/cs/title.txt
@@ -0,0 +1 @@
+Catima - Peněženka Libre Card
--- a/fastlane/metadata/android/da/short_description.txt
+++ b/fastlane/metadata/android/da/short_description.txt
@@ -0,0 +1 @@
+Til dine stregkoder, medlemskaber, loyalitetsprogrammer, kuponer og billetter.
--- a/fastlane/metadata/android/da/title.txt
+++ b/fastlane/metadata/android/da/title.txt
@@ -0,0 +1 @@
+Catima - Den frie kortpung
--- a/fastlane/metadata/android/nb-NO/full_description.txt
+++ b/fastlane/metadata/android/nb-NO/full_description.txt
@@ -8,7 +8,7 @@ Med dette essensielle verktøyet kan du erstatte unyttig plast med kontanter.
 - Unngå spionasje med veldig få tilganger. Ingen tilgang til Internett, og ingen reklame.
 - Legg til kort eller koder med navn og egne farger.
 - Manuell kodeinnskriving hvis det ikke er noen strekkode å lagre, eller den ikke kan brukes.
- Importer kort og koder fra filer, Catima, Loyalty Card Keychain, Voucher Vault, og FidMe.
+- Importer kort og koder fra filer ,Catima, FidMe, Kundekortknippe, Stocard og Voucher Vault.
 - Lag en sikkerhetskopi av alle kortene dine og overfør dem til en ny enhet hvis du ønsker det.
 - Del kupponger, eksklusive tilbud, promokoder eller kort og koder ved bruk av ethvert program.
 - Mørk drakt og tilgjengelighetsvalg for synshemmede brukere.
Author	SHA1	Message	Date
Sylvia van Os	44711043b9	Release Catima 2.2.1	2021-08-07 13:28:02 +02:00
Sylvia van Os	80ee8aa860	Merge branch 'master' of github.com:TheLastProject/loyalty-card-locker	2021-08-07 13:16:35 +02:00
Sylvia van Os	cd6685b974	Fix flashing in ManageGroupsActivity	2021-08-07 13:16:21 +02:00
Sylvia van Os	b5f464000b	Merge pull request #318 from weblate/weblate-catima-catima Translations update from Weblate	2021-08-07 05:54:03 +02:00
J. Lavoie	27159323d5	Translated using Weblate (Italian) Currently translated at 100.0% (172 of 172 strings) Translation: Catima/Catima Translate-URL: https://hosted.weblate.org/projects/catima/catima/it/	2021-08-07 02:41:29 +02:00
J. Lavoie	9551ce8a8b	Translated using Weblate (French) Currently translated at 100.0% (172 of 172 strings) Translation: Catima/Catima Translate-URL: https://hosted.weblate.org/projects/catima/catima/fr/	2021-08-07 02:41:29 +02:00
J. Lavoie	525471f749	Translated using Weblate (German) Currently translated at 100.0% (172 of 172 strings) Translation: Catima/Catima Translate-URL: https://hosted.weblate.org/projects/catima/catima/de/	2021-08-07 02:41:28 +02:00
Sylvia van Os	57bedd0300	Actually fix properly	2021-08-05 20:51:29 +02:00
Sylvia van Os	c3345a1a15	Fix last commit	2021-08-05 20:35:44 +02:00
Sylvia van Os	15f6bd86a1	Change card title size within range	2021-08-05 20:21:18 +02:00
Sylvia van Os	e2ad1c9da2	Add animations to card list	2021-08-05 19:38:37 +02:00
Sylvia van Os	7082669612	Fix importing Catima export with multiline note	2021-08-05 18:28:14 +02:00
Sylvia van Os	d595d24769	Merge pull request #313 from weblate/weblate-catima-catima Translations update from Weblate	2021-08-04 23:26:51 +02:00
Gediminas Murauskas	4287d66f6f	Translated using Weblate (Lithuanian) Currently translated at 100.0% (172 of 172 strings) Translation: Catima/Catima Translate-URL: https://hosted.weblate.org/projects/catima/catima/lt/	2021-08-04 23:24:45 +02:00
Sylvia van Os	311361d105	Merge pull request #312 from weblate/weblate-catima-catima Translations update from Weblate	2021-08-04 23:24:41 +02:00
Sylvia van Os	4a88e39deb	Fix syntax	2021-08-04 22:38:13 +02:00
mondstern	4511590263	Translated using Weblate (Danish) Currently translated at 66.6% (2 of 3 strings) Translation: Catima/Fastlane Translate-URL: https://hosted.weblate.org/projects/catima/fastlane/da/	2021-08-04 22:32:46 +02:00
mondstern	d0c30ffa1c	Translated using Weblate (Danish) Currently translated at 27.3% (47 of 172 strings) Translation: Catima/Catima Translate-URL: https://hosted.weblate.org/projects/catima/catima/da/	2021-08-04 22:32:46 +02:00
Allan Nordhøy	813c2bff85	Translated using Weblate (Norwegian Bokmål) Currently translated at 100.0% (3 of 3 strings) Translation: Catima/Fastlane Translate-URL: https://hosted.weblate.org/projects/catima/fastlane/nb_NO/	2021-08-04 22:32:45 +02:00
solokot	0c3cf43841	Translated using Weblate (Russian) Currently translated at 100.0% (172 of 172 strings) Translation: Catima/Catima Translate-URL: https://hosted.weblate.org/projects/catima/catima/ru/	2021-08-04 22:32:45 +02:00
Heimen Stoffels	6c651f7e3e	Translated using Weblate (Dutch) Currently translated at 100.0% (172 of 172 strings) Translation: Catima/Catima Translate-URL: https://hosted.weblate.org/projects/catima/catima/nl/	2021-08-04 22:32:45 +02:00
Allan Nordhøy	ef7fc92920	Translated using Weblate (Norwegian Bokmål) Currently translated at 90.1% (155 of 172 strings) Translation: Catima/Catima Translate-URL: https://hosted.weblate.org/projects/catima/catima/nb_NO/	2021-08-04 22:32:44 +02:00
Sylvia van Os	ccaf70c749	Merge pull request #311 from weblate/weblate-catima-catima Translations update from Weblate	2021-08-03 20:59:42 +02:00
mondstern	2299bf9d86	Added translation using Weblate (Danish)	2021-08-03 20:58:37 +02:00
Sylvia van Os	b65f8f32ca	Merge pull request #310 from weblate/weblate-catima-catima Translations update from Weblate	2021-08-03 20:48:23 +02:00
mondstern	47695d3a72	Translated using Weblate (Czech) Currently translated at 66.6% (2 of 3 strings) Translation: Catima/Fastlane Translate-URL: https://hosted.weblate.org/projects/catima/fastlane/cs/	2021-08-03 20:43:07 +02:00
solokot	439c660b2e	Translated using Weblate (Russian) Currently translated at 100.0% (172 of 172 strings) Translation: Catima/Catima Translate-URL: https://hosted.weblate.org/projects/catima/catima/ru/	2021-08-03 20:43:07 +02:00
Gediminas Murauskas	4293d7d4b2	Translated using Weblate (Lithuanian) Currently translated at 100.0% (172 of 172 strings) Translation: Catima/Catima Translate-URL: https://hosted.weblate.org/projects/catima/catima/lt/	2021-08-03 20:43:07 +02:00
J. Lavoie	e368e66b8a	Translated using Weblate (Italian) Currently translated at 100.0% (172 of 172 strings) Translation: Catima/Catima Translate-URL: https://hosted.weblate.org/projects/catima/catima/it/	2021-08-03 20:43:07 +02:00
Mattia	992a7f9e84	Translated using Weblate (Italian) Currently translated at 100.0% (172 of 172 strings) Translation: Catima/Catima Translate-URL: https://hosted.weblate.org/projects/catima/catima/it/	2021-08-03 20:43:07 +02:00
J. Lavoie	ecf0faf00a	Translated using Weblate (French) Currently translated at 100.0% (172 of 172 strings) Translation: Catima/Catima Translate-URL: https://hosted.weblate.org/projects/catima/catima/fr/	2021-08-03 20:43:07 +02:00
J. Lavoie	64178f3fd1	Translated using Weblate (Spanish) Currently translated at 100.0% (172 of 172 strings) Translation: Catima/Catima Translate-URL: https://hosted.weblate.org/projects/catima/catima/es/	2021-08-03 20:43:07 +02:00
J. Lavoie	dab6588800	Translated using Weblate (German) Currently translated at 100.0% (172 of 172 strings) Translation: Catima/Catima Translate-URL: https://hosted.weblate.org/projects/catima/catima/de/	2021-08-03 20:43:07 +02:00
mondstern	f71bb32592	Translated using Weblate (Czech) Currently translated at 51.1% (88 of 172 strings) Translation: Catima/Catima Translate-URL: https://hosted.weblate.org/projects/catima/catima/cs/	2021-08-03 20:43:07 +02:00
Sylvia van Os	0c44212d92	Make SpotBugs happy	2021-08-03 20:42:57 +02:00
Sylvia van Os	ce149c91e9	Improve Stocard importer	2021-08-03 20:34:44 +02:00
Sylvia van Os	05dfd48f57	Release Catima 2.2.0	2021-08-02 23:42:32 +02:00
Sylvia van Os	ef955b866d	Remove unused imports	2021-08-02 23:09:49 +02:00
Sylvia van Os	a843b5a1b9	Make lint happier	2021-08-02 22:58:06 +02:00
Sylvia van Os	8305d58ccc	Fix maximize button appearing on no barcode	2021-08-02 22:57:55 +02:00
Sylvia van Os	6af79d5f41	General cleanups	2021-08-02 20:47:48 +02:00
Sylvia van Os	3b326d6f9c	Also remove from AboutActivity	2021-08-02 20:37:13 +02:00
Sylvia van Os	1456e5073e	Get rid of barely used dependency	2021-08-02 20:36:20 +02:00
Sylvia van Os	6a13dbf66a	Comma-separate group names in loyalty card view	2021-08-01 23:03:56 +02:00
Sylvia van Os	c5b1718e8e	Pre-select active group on creating new card	2021-08-01 22:33:44 +02:00
Sylvia van Os	e2bcc24867	Make links in notes clickable	2021-08-01 21:39:48 +02:00
				`@@ -0,0 +1 @@`
				`Pro čárové kódy, členství, věrnostní programy, kupony a vstupenky.`
				`@@ -0,0 +1 @@`
				`Til dine stregkoder, medlemskaber, loyalitetsprogrammer, kuponer og billetter.`