Release Catima 2.16.0

Update Fastlane changelogs

CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 
+## v2.16.0 - 104 (2022-03-09)
+
+- Save card detail expansion state
+- Minor UI fixes
+
 ## v2.15.2 - 103 (2022-02-11)
 
 - Fix manual language selection not applying everywhere

app/build.gradle

@@ -18,8 +18,8 @@ android {
         applicationId "me.hackerchick.catima"
         minSdkVersion 21
         targetSdkVersion 31
-        versionCode 103
-        versionName "2.15.2"
+        versionCode 104
+        versionName "2.16.0"
 
         vectorDrawables.useSupportLibrary true
         multiDexEnabled true

app/src/main/AndroidManifest.xml

@@ -134,7 +134,5 @@
                 <action android:name="android.service.controls.ControlsProviderService" />
             </intent-filter>
         </service>
-
     </application>
-
 </manifest>

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

@@ -5,6 +5,7 @@ import android.graphics.Bitmap;
 import android.graphics.Color;
 import android.graphics.PorterDuff;
 import android.util.Log;
+import android.util.TypedValue;
 import android.view.View;
 import android.widget.ImageView;
 import android.widget.TextView;
@@ -46,7 +47,7 @@ public class BarcodeImageWriterTask implements CompatCallable<Bitmap> {
     BarcodeImageWriterTask(
             Context context, ImageView imageView, String cardIdString,
             CatimaBarcode barcodeFormat, TextView textView,
-            boolean showFallback, Runnable callback
+            boolean showFallback, Runnable callback, boolean roundCornerPadding
     ) {
         mContext = context;
 
@@ -60,18 +61,32 @@ public class BarcodeImageWriterTask implements CompatCallable<Bitmap> {
         cardId = cardIdString;
         format = barcodeFormat;
 
+        int padding = 0;
+        // Some barcodes already have internal whitespace and shouldn't get extra padding
+        // TODO: Get rid of this hack by somehow detecting this extra whitespace
+        if (roundCornerPadding && !barcodeFormat.hasInternalPadding()) {
+            padding = Math.round(TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, 10, context.getResources().getDisplayMetrics()));
+        }
+
         final int MAX_WIDTH = getMaxWidth(format);
 
+        int tempImageHeight;
+        int tempImageWidth;
+
         if (imageView.getWidth() < MAX_WIDTH) {
-            imageHeight = imageView.getHeight();
-            imageWidth = imageView.getWidth();
+            tempImageHeight = imageView.getHeight();
+            tempImageWidth = imageView.getWidth();
         } else {
             // Scale down the image to reduce the memory needed to produce it
-            imageWidth = MAX_WIDTH;
+            tempImageWidth = MAX_WIDTH;
             double ratio = (double) MAX_WIDTH / (double) imageView.getWidth();
-            imageHeight = (int) (imageView.getHeight() * ratio);
+            tempImageHeight = (int) (imageView.getHeight() * ratio);
         }
 
+        // Ensure space for padding if wanted
+        imageWidth = tempImageWidth;
+        imageHeight = tempImageHeight - padding;
+
         this.showFallback = showFallback;
     }
 

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

@@ -76,6 +76,7 @@ public class BarcodeSelectorAdapter extends ArrayAdapter<CatimaBarcodeWithValue>
         final CatimaBarcode format = CatimaBarcode.fromName(formatType);
 
         image.setImageBitmap(null);
+        image.setClipToOutline(true);
 
         if (image.getHeight() == 0) {
             // The size of the ImageView is not yet available as it has not
@@ -89,13 +90,13 @@ public class BarcodeSelectorAdapter extends ArrayAdapter<CatimaBarcodeWithValue>
 
                             Log.d(TAG, "Generating barcode for type " + formatType);
 
-                            BarcodeImageWriterTask barcodeWriter = new BarcodeImageWriterTask(getContext(), image, cardId, format, text, true, null);
+                            BarcodeImageWriterTask barcodeWriter = new BarcodeImageWriterTask(getContext(), image, cardId, format, text, true, null, true);
                             mTasks.executeTask(TaskHandler.TYPE.BARCODE, barcodeWriter);
                         }
                     });
         } else {
             Log.d(TAG, "Generating barcode for type " + formatType);
-            BarcodeImageWriterTask barcodeWriter = new BarcodeImageWriterTask(getContext(), image, cardId, format, text, true, null);
+            BarcodeImageWriterTask barcodeWriter = new BarcodeImageWriterTask(getContext(), image, cardId, format, text, true, null, true);
             mTasks.executeTask(TaskHandler.TYPE.BARCODE, barcodeWriter);
         }
     }

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

@@ -4,6 +4,8 @@ import android.database.Cursor;
 import android.database.sqlite.SQLiteDatabase;
 import android.os.Bundle;
 import android.util.Log;
+import android.view.Menu;
+import android.view.MenuItem;
 import android.widget.Toast;
 
 import androidx.appcompat.app.AppCompatActivity;
@@ -16,9 +18,10 @@ import androidx.recyclerview.widget.RecyclerView;
 /**
  * The configuration screen for creating a shortcut.
  */
-public class CardShortcutConfigure extends AppCompatActivity implements LoyaltyCardCursorAdapter.CardAdapterListener {
+public class CardShortcutConfigure extends CatimaAppCompatActivity implements LoyaltyCardCursorAdapter.CardAdapterListener {
     static final String TAG = "Catima";
     private SQLiteDatabase mDatabase;
+    private LoyaltyCardCursorAdapter mAdapter;
 
     @Override
     public void onCreate(Bundle bundle) {
@@ -33,6 +36,7 @@ public class CardShortcutConfigure extends AppCompatActivity implements LoyaltyC
         setContentView(R.layout.simple_toolbar_list_activity);
         Toolbar toolbar = findViewById(R.id.toolbar);
         toolbar.setTitle(R.string.shortcutSelectCard);
+        setSupportActionBar(toolbar);
 
         // If there are no cards, bail
         if (DBHelper.getLoyaltyCardCount(mDatabase) == 0) {
@@ -47,8 +51,8 @@ public class CardShortcutConfigure extends AppCompatActivity implements LoyaltyC
         }
 
         Cursor cardCursor = DBHelper.getLoyaltyCardCursor(mDatabase);
-        final LoyaltyCardCursorAdapter adapter = new LoyaltyCardCursorAdapter(this, cardCursor, this);
-        cardList.setAdapter(adapter);
+        mAdapter = new LoyaltyCardCursorAdapter(this, cardCursor, this);
+        cardList.setAdapter(mAdapter);
     }
 
     private void onClickAction(int position) {
@@ -65,6 +69,26 @@ public class CardShortcutConfigure extends AppCompatActivity implements LoyaltyC
         finish();
     }
 
+    @Override
+    public boolean onCreateOptionsMenu(Menu inputMenu) {
+        getMenuInflater().inflate(R.menu.card_details_menu, inputMenu);
+        Utils.updateMenuCardDetailsButtonState(inputMenu.findItem(R.id.action_unfold), mAdapter.showingDetails());
+        return super.onCreateOptionsMenu(inputMenu);
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem inputItem) {
+        int id = inputItem.getItemId();
+
+        if (id == R.id.action_unfold) {
+            mAdapter.showDetails(!mAdapter.showingDetails());
+            invalidateOptionsMenu();
+
+            return true;
+        }
+
+        return super.onOptionsItemSelected(inputItem);
+    }
 
     @Override
     public void onRowClicked(int inputPosition) {

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

@@ -72,6 +72,11 @@ public class CatimaBarcode {
                 || mBarcodeFormat == BarcodeFormat.QR_CODE;
     }
 
+    public boolean hasInternalPadding() {
+        return mBarcodeFormat == BarcodeFormat.PDF_417
+                || mBarcodeFormat == BarcodeFormat.QR_CODE;
+    }
+
     public BarcodeFormat format() {
         return mBarcodeFormat;
     }

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

@@ -10,6 +10,9 @@ import android.graphics.Paint;
 import android.graphics.Rect;
 import android.graphics.Typeface;
 import android.text.TextPaint;
+import android.util.Log;
+
+import androidx.core.graphics.PaintCompat;
 
 /**
  * Original from https://github.com/andOTP/andOTP/blob/master/app/src/main/java/org/shadowice/flocke/andotp/Utilities/LetterBitmap.java
@@ -48,7 +51,6 @@ class LetterBitmap {
     public LetterBitmap(Context context, String displayName, String key, int tileLetterFontSize,
                         int width, int height, Integer backgroundColor, Integer textColor) {
         TextPaint paint = new TextPaint();
-        paint.setTypeface(Typeface.create("sans-serif-light", Typeface.BOLD));
 
         if (textColor != null) {
             paint.setColor(textColor);
@@ -58,6 +60,8 @@ class LetterBitmap {
 
         paint.setTextAlign(Paint.Align.CENTER);
         paint.setAntiAlias(true);
+        paint.setTextSize(tileLetterFontSize);
+        paint.setTypeface(Typeface.defaultFromStyle(Typeface.BOLD));
 
         if (backgroundColor == null) {
             mColor = getDefaultColor(context, key);
@@ -66,22 +70,30 @@ class LetterBitmap {
         }
 
         mBitmap = Bitmap.createBitmap(width, height, Bitmap.Config.ARGB_8888);
-        String firstChar = displayName.substring(0, 1);
+        String firstChar = displayName.substring(0, 1).toUpperCase();
+        int firstCharEnd = 2;
+        while (firstCharEnd <= displayName.length()) {
+            // test for the longest render-able string
+            String test = displayName.substring(0, firstCharEnd);
+            if (PaintCompat.hasGlyph(paint, test)) {
+                firstChar = test;
+            }
+            firstCharEnd++;
+        }
+
+        Log.d("LetterBitmap", "using sequence " + firstChar + " to render first char which has length " + firstChar.length());
 
         final Canvas c = new Canvas();
         c.setBitmap(mBitmap);
         c.drawColor(mColor);
 
-        char[] firstCharArray = new char[1];
-        firstCharArray[0] = firstChar.toUpperCase().charAt(0);
-        paint.setTextSize(tileLetterFontSize);
-
-        // The bounds that enclose the letter
         Rect bounds = new Rect();
+        paint.getTextBounds(firstChar, 0, firstChar.length(), bounds);
+        c.drawText(firstChar,
+                0, firstChar.length(),
+                width / 2.0f, (height - (bounds.bottom + bounds.top)) / 2.0f
+                , paint);
 
-        paint.getTextBounds(firstCharArray, 0, 1, bounds);
-        c.drawText(firstCharArray, 0, 1, width / 2.0f, height / 2.0f
-                + (bounds.bottom - bounds.top) / 2.0f, paint);
     }
 
     /**

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

@@ -1,6 +1,7 @@
 package protect.card_locker;
 
 import android.content.Context;
+import android.content.SharedPreferences;
 import android.content.res.Resources;
 import android.database.Cursor;
 import android.graphics.Bitmap;
@@ -40,7 +41,7 @@ public class LoyaltyCardCursorAdapter extends BaseCursorAdapter<LoyaltyCardCurso
     protected SparseBooleanArray mSelectedItems;
     protected SparseBooleanArray mAnimationItemsIndex;
     private boolean mReverseAllAnimations = false;
-    private boolean mShowDetails = true;
+    private boolean mShowDetails;
 
     public LoyaltyCardCursorAdapter(Context inputContext, Cursor inputCursor, CardAdapterListener inputListener) {
         super(inputCursor, DBHelper.LoyaltyCardDbIds.ID);
@@ -53,12 +54,30 @@ public class LoyaltyCardCursorAdapter extends BaseCursorAdapter<LoyaltyCardCurso
 
         mDarkModeEnabled = Utils.isDarkModeEnabled(inputContext);
 
+        refreshState();
+
         swapCursor(inputCursor);
     }
 
+    public void refreshState() {
+        // Retrieve user details preference
+        SharedPreferences cardDetailsPref = mContext.getSharedPreferences(
+                mContext.getString(R.string.sharedpreference_card_details),
+                Context.MODE_PRIVATE);
+        mShowDetails = cardDetailsPref.getBoolean(mContext.getString(R.string.sharedpreference_card_details_show), true);
+    }
+
     public void showDetails(boolean show) {
         mShowDetails = show;
         notifyDataSetChanged();
+
+        // Store in Shared Preference to restore next adapter launch
+        SharedPreferences cardDetailsPref = mContext.getSharedPreferences(
+                mContext.getString(R.string.sharedpreference_card_details),
+                Context.MODE_PRIVATE);
+        SharedPreferences.Editor cardDetailsPrefEditor = cardDetailsPref.edit();
+        cardDetailsPrefEditor.putBoolean(mContext.getString(R.string.sharedpreference_card_details_show), show);
+        cardDetailsPrefEditor.apply();
     }
 
     public boolean showingDetails() {

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

@@ -323,6 +323,7 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity {
         barcodeIdField = findViewById(R.id.barcodeIdField);
         barcodeTypeField = findViewById(R.id.barcodeTypeField);
         barcodeImage = findViewById(R.id.barcode);
+        barcodeImage.setClipToOutline(true);
         barcodeImageLayout = findViewById(R.id.barcodeLayout);
         barcodeCaptureLayout = findViewById(R.id.barcodeCaptureLayout);
         cardImageFrontHolder = findViewById(R.id.frontImageHolder);
@@ -1449,13 +1450,13 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity {
                             barcodeImage.getViewTreeObserver().removeOnGlobalLayoutListener(this);
 
                             Log.d(TAG, "ImageView size now known");
-                            BarcodeImageWriterTask barcodeWriter = new BarcodeImageWriterTask(getApplicationContext(), barcodeImage, cardIdString, barcodeFormat, null, false, barcodeImageGenerationFinishedCallback);
+                            BarcodeImageWriterTask barcodeWriter = new BarcodeImageWriterTask(getApplicationContext(), barcodeImage, cardIdString, barcodeFormat, null, false, barcodeImageGenerationFinishedCallback, true);
                             mTasks.executeTask(TaskHandler.TYPE.BARCODE, barcodeWriter);
                         }
                     });
         } else {
             Log.d(TAG, "ImageView size known known, creating barcode");
-            BarcodeImageWriterTask barcodeWriter = new BarcodeImageWriterTask(getApplicationContext(), barcodeImage, cardIdString, barcodeFormat, null, false, barcodeImageGenerationFinishedCallback);
+            BarcodeImageWriterTask barcodeWriter = new BarcodeImageWriterTask(getApplicationContext(), barcodeImage, cardIdString, barcodeFormat, null, false, barcodeImageGenerationFinishedCallback, true);
             mTasks.executeTask(TaskHandler.TYPE.BARCODE, barcodeWriter);
         }
     }

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

@@ -278,6 +278,7 @@ public class LoyaltyCardViewActivity extends CatimaAppCompatActivity implements
         storeName = findViewById(R.id.storeName);
         maximizeButton = findViewById(R.id.maximizeButton);
         mainImage = findViewById(R.id.mainImage);
+        mainImage.setClipToOutline(true);
         dotIndicator = findViewById(R.id.dotIndicator);
         minimizeButton = findViewById(R.id.minimizeButton);
         collapsingToolbarLayout = findViewById(R.id.collapsingToolbarLayout);
@@ -304,7 +305,7 @@ public class LoyaltyCardViewActivity extends CatimaAppCompatActivity implements
 
                 setCenterGuideline(loyaltyCard.zoomLevel);
 
-                drawMainImage(mainImageIndex, true);
+                drawMainImage(mainImageIndex, true, isFullscreen);
             }
 
             @Override
@@ -400,7 +401,7 @@ public class LoyaltyCardViewActivity extends CatimaAppCompatActivity implements
 
     private void adjustLayoutHeights() {
         // use getLayoutParams instead of getHeight when heights are pre-determined in xml! getHeight could return 0 if a View is not inflated
-        if (iconImage.getLayoutParams().height != appBarLayout.getHeight()) {
+        if (appBarLayout.getHeight() != 0 && iconImage.getLayoutParams().height != appBarLayout.getHeight()) {
             Log.d("adjustLayoutHeights", "setting imageIcon height from: " + iconImage.getLayoutParams().height + " to: " + appBarLayout.getHeight());
             iconImage.setLayoutParams(new CoordinatorLayout.LayoutParams(
                     CoordinatorLayout.LayoutParams.MATCH_PARENT, appBarLayout.getHeight())
@@ -807,7 +808,7 @@ public class LoyaltyCardViewActivity extends CatimaAppCompatActivity implements
         }
     }
 
-    private void drawBarcode() {
+    private void drawBarcode(boolean addPadding) {
         mTasks.flushTaskList(TaskHandler.TYPE.BARCODE, true, false, false);
         if (format != null) {
             BarcodeImageWriterTask barcodeWriter = new BarcodeImageWriterTask(
@@ -817,12 +818,13 @@ public class LoyaltyCardViewActivity extends CatimaAppCompatActivity implements
                     format,
                     null,
                     false,
-                    null);
+                    null,
+                    addPadding);
             mTasks.executeTask(TaskHandler.TYPE.BARCODE, barcodeWriter);
         }
     }
 
-    private void redrawBarcodeAfterResize() {
+    private void redrawBarcodeAfterResize(boolean addPadding) {
         if (format != null) {
             mainImage.getViewTreeObserver().addOnGlobalLayoutListener(
                     new ViewTreeObserver.OnGlobalLayoutListener() {
@@ -831,13 +833,13 @@ public class LoyaltyCardViewActivity extends CatimaAppCompatActivity implements
                             mainImage.getViewTreeObserver().removeOnGlobalLayoutListener(this);
 
                             Log.d(TAG, "ImageView size now known");
-                            drawBarcode();
+                            drawBarcode(addPadding);
                         }
                     });
         }
     }
 
-    private void drawMainImage(int index, boolean waitForResize) {
+    private void drawMainImage(int index, boolean waitForResize, boolean isFullscreen) {
         if (imageTypes.isEmpty()) {
             mainImage.setVisibility(View.GONE);
             return;
@@ -853,12 +855,19 @@ public class LoyaltyCardViewActivity extends CatimaAppCompatActivity implements
         ImageType wantedImageType = imageTypes.get(index);
 
         if (wantedImageType == ImageType.BARCODE) {
-            if (waitForResize) {
-                redrawBarcodeAfterResize();
+            // Use border in non-fullscreen mode
+            if (!isFullscreen) {
+                mainImage.setBackground(AppCompatResources.getDrawable(this, R.drawable.round_outline));
             } else {
-                drawBarcode();
+                mainImage.setBackgroundColor(Color.WHITE);
             }
-            mainImage.setBackgroundColor(Color.WHITE);
+
+            if (waitForResize) {
+                redrawBarcodeAfterResize(!isFullscreen);
+            } else {
+                drawBarcode(!isFullscreen);
+            }
+
             mainImage.setContentDescription(getString(R.string.barcodeImageDescriptionWithType, format.prettyName()));
         } else if (wantedImageType == ImageType.IMAGE_FRONT) {
             mainImage.setImageBitmap(frontImageBitmap);
@@ -888,7 +897,7 @@ public class LoyaltyCardViewActivity extends CatimaAppCompatActivity implements
 
         mainImageIndex = newIndex;
 
-        drawMainImage(newIndex, false);
+        drawMainImage(newIndex, false, isFullscreen);
     }
 
     /**
@@ -904,7 +913,7 @@ public class LoyaltyCardViewActivity extends CatimaAppCompatActivity implements
         if (enabled && !imageTypes.isEmpty()) {
             Log.d(TAG, "Move into fullscreen");
 
-            drawMainImage(mainImageIndex, true);
+            drawMainImage(mainImageIndex, true, isFullscreen);
 
             barcodeScaler.setProgress(loyaltyCard.zoomLevel);
             setCenterGuideline(loyaltyCard.zoomLevel);
@@ -925,6 +934,7 @@ public class LoyaltyCardViewActivity extends CatimaAppCompatActivity implements
             // Or the barcode will be centered instead of on top of the screen
             // Don't ask me why...
             appBarLayout.setVisibility(View.INVISIBLE);
+            iconImage.setVisibility(View.INVISIBLE);
             collapsingToolbarLayout.setVisibility(View.GONE);
             landscapeToolbar.setVisibility(View.GONE);
 
@@ -949,7 +959,7 @@ public class LoyaltyCardViewActivity extends CatimaAppCompatActivity implements
             // Reset center guideline
             setCenterGuideline(100);
 
-            drawMainImage(mainImageIndex, true);
+            drawMainImage(mainImageIndex, true, isFullscreen);
 
             // Show maximize and hide minimize button and scaler
             maximizeButton.setVisibility(imageTypes.isEmpty() ? View.GONE : View.VISIBLE);
@@ -966,6 +976,7 @@ public class LoyaltyCardViewActivity extends CatimaAppCompatActivity implements
             // And restore 24dp paddingTop for appBarLayout
             appBarLayout.setVisibility(View.VISIBLE);
             setupOrientation();
+            iconImage.setVisibility(View.VISIBLE);
 
             // Show other UI elements
             cardIdFieldView.setVisibility(View.VISIBLE);

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

@@ -298,6 +298,8 @@ public class MainActivity extends CatimaAppCompatActivity implements LoyaltyCard
     protected void onResume() {
         super.onResume();
 
+        mAdapter.refreshState();
+
         if (mCurrentActionMode != null) {
             mAdapter.clearSelections();
             mCurrentActionMode.finish();
@@ -452,6 +454,7 @@ public class MainActivity extends CatimaAppCompatActivity implements LoyaltyCard
     public boolean onCreateOptionsMenu(Menu inputMenu) {
         getMenuInflater().inflate(R.menu.main_menu, inputMenu);
 
+        Utils.updateMenuCardDetailsButtonState(inputMenu.findItem(R.id.action_unfold), mAdapter.showingDetails());
         displayCardSetupOptions(inputMenu, mLoyaltyCardCount > 0);
 
         SearchManager searchManager = (SearchManager) getSystemService(Context.SEARCH_SERVICE);
@@ -493,17 +496,8 @@ public class MainActivity extends CatimaAppCompatActivity implements LoyaltyCard
         int id = inputItem.getItemId();
 
         if (id == R.id.action_unfold) {
-            boolean shouldShow = !mAdapter.showingDetails();
-
-            if (shouldShow) {
-                inputItem.setIcon(R.drawable.ic_baseline_unfold_less_24);
-                inputItem.setTitle(R.string.action_hide_details);
-            } else {
-                inputItem.setIcon(R.drawable.ic_baseline_unfold_more_24);
-                inputItem.setTitle(R.string.action_show_details);
-            }
-
-            mAdapter.showDetails(shouldShow);
+            mAdapter.showDetails(!mAdapter.showingDetails());
+            invalidateOptionsMenu();
 
             return true;
         }

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

@@ -1,12 +1,13 @@
 package protect.card_locker;
 
-
 import android.content.Intent;
 import android.database.sqlite.SQLiteDatabase;
 import android.os.Bundle;
 import android.text.Editable;
 import android.text.TextWatcher;
 import android.util.Log;
+import android.view.Menu;
+import android.view.MenuItem;
 import android.view.View;
 import android.widget.EditText;
 import android.widget.TextView;
@@ -156,6 +157,26 @@ public class ManageGroupActivity extends CatimaAppCompatActivity implements Mana
         return ret;
     }
 
+    @Override
+    public boolean onCreateOptionsMenu(Menu inputMenu) {
+        getMenuInflater().inflate(R.menu.card_details_menu, inputMenu);
+        Utils.updateMenuCardDetailsButtonState(inputMenu.findItem(R.id.action_unfold), mAdapter.showingDetails());
+        return super.onCreateOptionsMenu(inputMenu);
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem inputItem) {
+        int id = inputItem.getItemId();
+
+        if (id == R.id.action_unfold) {
+            mAdapter.showDetails(!mAdapter.showingDetails());
+            invalidateOptionsMenu();
+
+            return true;
+        }
+
+        return super.onOptionsItemSelected(inputItem);
+    }
 
     @Override
     protected void onSaveInstanceState(@NonNull Bundle outState) {

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

@@ -15,6 +15,8 @@ import android.os.LocaleList;
 import android.provider.MediaStore;
 import android.util.Log;
 import android.util.TypedValue;
+import android.view.Menu;
+import android.view.MenuItem;
 import android.widget.Toast;
 
 import com.google.android.material.color.DynamicColors;
@@ -506,4 +508,14 @@ public class Utils {
         activity.getTheme().resolveAttribute(android.R.attr.colorBackground, typedValue, true);
         activity.findViewById(android.R.id.content).setBackgroundColor(typedValue.data);
     }
+
+    public static void updateMenuCardDetailsButtonState(MenuItem item, boolean currentlyExpanded) {
+        if (currentlyExpanded) {
+            item.setIcon(R.drawable.ic_baseline_unfold_less_24);
+            item.setTitle(R.string.action_hide_details);
+        } else {
+            item.setIcon(R.drawable.ic_baseline_unfold_more_24);
+            item.setTitle(R.string.action_show_details);
+        }
+    }
 }

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

@@ -0,0 +1,5 @@
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <solid android:color="#FFFFFF" />
+    <corners android:radius="10dp" />
+</shape>

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

@@ -5,6 +5,7 @@
     android:layout_height="wrap_content"
     xmlns:android="http://schemas.android.com/apk/res/android">
     <ImageView
+        android:background="@drawable/round_outline"
         android:importantForAccessibility="no"
         android:layout_width="match_parent"
         android:layout_height="@dimen/barcode_disp_height"

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

@@ -73,8 +73,7 @@
                         app:cardCornerRadius="4dp"
                         android:paddingHorizontal="@dimen/inputPadding"
                         app:cardElevation="0dp"
-                        app:cardBackgroundColor="@android:color/transparent"
-                        android:outlineProvider="none">
+                        app:cardBackgroundColor="@android:color/transparent">
 
                         <ImageView
                             android:id="@+id/thumbnail"
@@ -180,17 +179,18 @@
 
                 <!-- Barcode -->
                 <LinearLayout android:orientation="horizontal"
-                    android:padding="10.0dip"
+                    android:layout_marginTop="10.0dp"
+                    android:layout_marginStart="10.0dp"
+                    android:layout_marginEnd="10.0dp"
                     android:layout_width="fill_parent"
                     android:layout_height="wrap_content"
                     android:id="@+id/barcodeLayout">
                     <ImageView
+                        android:background="@drawable/round_outline"
                         android:importantForAccessibility="no"
                         android:layout_width="0dp"
                         android:layout_height="@dimen/barcode_disp_height"
                         android:layout_gravity="center_horizontal"
-                        android:padding="10.0dp"
-                        android:background="#ffffff"
                         android:id="@+id/barcode"
                         android:layout_weight="1.0"/>
                 </LinearLayout>

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

@@ -3,7 +3,8 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    android:layout_height="match_parent"
+    android:fitsSystemWindows="true">
 
     <com.google.android.material.appbar.AppBarLayout
         android:layout_width="match_parent"

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

@@ -0,0 +1,9 @@
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+      xmlns:app="http://schemas.android.com/apk/res-auto">
+    <item
+        android:id="@+id/action_unfold"
+        android:title="@string/action_hide_details"
+        android:icon="@drawable/ic_baseline_unfold_less_24"
+        app:showAsAction="always"
+        android:visible="true"/>
+</menu>

app/src/main/res/raw/contributors.txt

@@ -4,16 +4,16 @@ J. Lavoie
 Allan Nordhøy
 Heimen Stoffels
 solokot
-mondstern
 Katharine Chui
+mondstern
 Oğuz Ersen
 IllusiveMan196
 Altonss
 Petr Novák
 Joel A
+StoyanDimitrov
 Taco
 Gediminas Murauskas
-StoyanDimitrov
 Nyatsuki
 Michael Moroni
 Samantaz Fox
@@ -21,8 +21,8 @@ arno-github
 Ankit Tiwari
 Sergio Paredes
 laralem
-arshbeerSingh
 huuhaa
+arshbeerSingh
 Miha Frangež
 sr093906
 mdvhimself
@@ -30,12 +30,13 @@ Maciej Błędkowski
 Olivia (Zoe)
 Quentin PAGÈS
 betsythefc
+Silvério Santos
 waffshappen
 ati3
 K. Herbert
+Still Hsu
 String E. Fighter
 Yurical
-Silvério Santos
 rr-vesp
 /usr/local/ΕΨΗΕΛΩΝ
 Adolfo Jayme-Barrientos
@@ -49,7 +50,7 @@ Lukas Grassauer
 Marnick L'Eau
 Michalis
 Rosdyana Kusuma
-schirinowski
+umoenks
 Thomas Bertels
 inesre
 lgasp
@@ -65,8 +66,9 @@ Kasina Dheeraj
 Eric
 Flav
 Franciszek Stefan
+Giovanni
 Izzy
-krkk
+Karol Kosek
 bittin
 Marco
 Mattia
@@ -80,7 +82,6 @@ Rohan Babbar
 Ronak Upadhyay
 Rose Liverman
 Simone Dotto
-Still Hsu
 Subhashish Anand
 Tymofii Lytvynenko
 Tjipke van der Heide

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

@@ -230,4 +230,5 @@
         <item quantity="other"><xliff:g>%s</xliff:g> точки</item>
     </plurals>
     <string name="settings_oled_dark">Чисто черен фон за тъмната тема</string>
+    <string name="include_if_asking_support">Ако искате да потърсите поддръжка, включете следната информация:</string>
 </resources>

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

@@ -1,28 +1,28 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2" xmlns:tools="http://schemas.android.com/tools">
-    <string name="noExternalStoragePermissionError">Salli käyttöoikeus ulkoisen tallennustilan käyttöön voidaksesi tuoda tai viedä kortteja</string>
+    <string name="noExternalStoragePermissionError">Salli käyttöoikeus ulkoisen tallennustilan käyttöön voidaksesi tuoda tai viedä tietoja</string>
     <string name="no">Ei</string>
     <string name="yes">Kyllä</string>
-    <string name="updateBarcodeQuestionText">Vaihdoit kortin ID-tunnuksen. Haluatko päivittää myös viivakoodin käyttämään samaa arvoa\?</string>
+    <string name="updateBarcodeQuestionText">Vaihdoit ID-tunnuksen. Haluatko päivittää myös viivakoodin käyttämään samaa arvoa\?</string>
     <string name="updateBarcodeQuestionTitle">Päivitä viivakoodin arvo\?</string>
     <string name="intent_import_card_from_url_share_multiple_text">Haluan jakaa joitain kortteja kanssasi</string>
-    <string name="copy_to_clipboard_multiple_toast">Kortin tunnukset kopioidaan leikepöydälle</string>
+    <string name="copy_to_clipboard_multiple_toast">ID-tunnukset kopioitu leikepöydälle</string>
     <string name="wrongValueForBarcodeType">Arvo ei ole kelvollinen valitulle viivakoodityypille</string>
     <string name="unsupportedBarcodeType">Tätä viivakoodityyppiä ei voi vielä näyttää. Sitä saatetaan tukea sovelluksen myöhemmässä versiossa.</string>
     <string name="setBarcodeId">Aseta viivakoodin arvo</string>
-    <string name="sameAsCardId">Sama kuin kortin ID-tunnus</string>
+    <string name="sameAsCardId">Sama kuin ID-tunnus</string>
     <string name="barcodeId">Viivakoodin arvo</string>
     <string name="importVoucherVaultMessage">Valitse tuotava <i>vouchervault.json</i>-vienti Voucher Vaultista.
-\nTai luo se painamalla ensin Vie Voucher Vaultissa.</string>
+\nLuo se painamalla ensin Vie Voucher Vaultissa.</string>
     <string name="importVoucherVault">Tuo Voucher Vault varmuuskopiotiedostosta</string>
-    <string name="importLoyaltyCardKeychainMessage">Valitse <i>LoyaltyCardKeychain.csv</i>-vientitietosi Loyalty Card Keychainista tuotavaksi.
+    <string name="importLoyaltyCardKeychainMessage">Valitse tuotava <i>LoyaltyCardKeychain.csv</i>-vientitiedostosi Loyalty Card Keychainista.
 \nTai luo se Loyalty Card Keychainin Import/Export-valikosta painamalla ensin Export (Vie).</string>
     <string name="importLoyaltyCardKeychain">Tuo Loyalty Card Keychain varmuuskopiotiedostosta</string>
-    <string name="importFidmeMessage">Valitse <i>fidme-export-request-xxxxxxxx.zip</i>-vienti FidMe:stä tuotavaksi ja valitse viivakoodityypit manuaalisesti sen jälkeen.
-\nTai luo se FidMe-profiilistasi valitsemalla Tietosuoja ja painamalla ensin Extract my data.</string>
+    <string name="importFidmeMessage">Valitse tuotava <i>fidme-export-request-xxxxxxxx.zip</i>-vientitiedostosi FidMe:stä ja valitse viivakoodityypit manuaalisesti sen jälkeen.
+\nLuo se FidMe-profiilistasi valitsemalla Tietosuoja ja painamalla ensin Extract my data.</string>
     <string name="importFidme">Tuo FidMe varmuuskopiotiedostosta</string>
-    <string name="importCatimaMessage">Valitse tuotava <i>catima.zip</i>-vienti Catimasta.
-\nTai luo se jonkin toisen Catima-sovelluksen Tuo/Vie-valikosta painamalla siellä ensin Vie.</string>
+    <string name="importCatimaMessage">Valitse tuotava <i>catima.zip</i>-vientitiedostosi Catimasta.
+\nLuo se Catima-sovelluksen Tuo/Vie-valikosta painamalla siellä ensin Vie.</string>
     <string name="importCatima">Tuo Catima varmuuskopiotiedostosta</string>
     <string name="accept">Hyväksy</string>
     <string name="privacy_policy_popup_text">Tietosuojaseloste (joidenkin sovelluskauppojen vaatimus):
@@ -30,7 +30,7 @@
 \nMITÄÄN TIETOJA EI KERÄTÄ LAINKAAN, minkä kuka tahansa voi vahvistaa, koska sovelluksemma on vapaa ohjelmisto.</string>
     <string name="privacy_policy">Tietosuojakäytäntö</string>
     <string name="app_loyalty_card_keychain">Kanta-asiakaskortin avainnippu</string>
-    <string name="chooseImportType">Tuo tietoja kohteesta\?</string>
+    <string name="chooseImportType">Tuo tietoja kohteesta</string>
     <string name="parsingBalanceFailed"><xliff:g>%s</xliff:g> ei vaikuta olevan kelvollinen saldo.</string>
     <string name="points">Pisteet</string>
     <string name="currency">Valuutta</string>
@@ -50,7 +50,7 @@
     <string name="expiryStateSentence">Vanhenee: <xliff:g>%s</xliff:g></string>
     <string name="groupsList">Ryhmät: <xliff:g>%s</xliff:g></string>
     <string name="addFromImage">Valitse kuva galleriasta</string>
-    <string name="addManually">Anna kortin ID-tunnus manuaalisesti</string>
+    <string name="addManually">Anna ID-tunnus manuaalisesti</string>
     <string name="leaveWithoutSaveConfirmation">Poistu tallentamatta\?</string>
     <string name="leaveWithoutSaveTitle">Poistu</string>
     <string name="moveDown">Siirrä alaspäin</string>
@@ -62,13 +62,13 @@
         <item quantity="one"><xliff:g>%d</xliff:g> kortti</item>
         <item quantity="other"><xliff:g>%d</xliff:g> kortit</item>
     </plurals>
-    <string name="noGroups">Napsauta + plus-painiketta lisätäksesi ensin ryhmät luokittelua varten.</string>
+    <string name="noGroups">Napsauta + plus-painiketta lisätäksesi ryhmät luokittelua varten.</string>
     <string name="groups">Ryhmät</string>
     <string name="enter_group_name">Anna ryhmän nimi</string>
-    <string name="exportSuccessful">Korttitietojen vienti valmis</string>
-    <string name="importSuccessful">Korttitietojen tuonti valmis</string>
+    <string name="exportSuccessful">Tiedot viety</string>
+    <string name="importSuccessful">Tiedot tuotu</string>
     <string name="intent_import_card_from_url_share_text">Haluan jakaa kortin kanssasi</string>
-    <string name="settings_disable_lockscreen_while_viewing_card">Estä lukitusnäyttö</string>
+    <string name="settings_disable_lockscreen_while_viewing_card">Estä näytön lukitus</string>
     <string name="settings_keep_screen_on">Pidä näyttö päällä</string>
     <string name="settings_lock_barcode_orientation">Lukitse viivakoodin suunta</string>
     <string name="settings_display_barcode_max_brightness">Kirkasta viivakoodinäkymää</string>
@@ -80,19 +80,19 @@
     <string name="settings_category_title_ui">Käyttöliittymä</string>
     <string name="settings">Asetukset</string>
     <string name="starImage">Suosikki tähti</string>
-    <string name="thumbnailDescription">Kortin pikkukuva</string>
-    <string name="copy_to_clipboard_toast">Kortin ID-tunnus kopioitu leikepöydälle</string>
-    <string name="enterBarcodeInstructions">Syötä kortin ID-tunnus ja valitse sen viivakoodityyppi, tai valitse \"Tällä kortilla ei ole viivakoodia\".</string>
+    <string name="thumbnailDescription">Pienoiskuva</string>
+    <string name="copy_to_clipboard_toast">ID-tunnus kopioitu leikepöydälle</string>
+    <string name="enterBarcodeInstructions">Syötä ID-tunnus ja valitse sen viivakoodityyppi, tai valitse \"Ei viivakoodia\".</string>
     <string name="selectBarcodeTitle">Valitse viivakoodi</string>
     <string name="app_resources">Vapaat kolmannen osapuolen resurssit: <xliff:g id="app_resources_list">%s</xliff:g></string>
     <string name="app_libraries">Kolmannen osapuolen Libre-kirjastot: <xliff:g id="app_libraries_list">%s</xliff:g></string>
     <string name="app_revision_fmt">Muutostiedot: <xliff:g id="app_revision_url">%s</xliff:g></string>
     <string name="debug_version_fmt">Versio: <xliff:g id="version">%s</xliff:g></string>
     <string name="about_title_fmt">Tietoja <xliff:g id="app_name">%s</xliff:g></string>
-    <string name="app_license">Copyleft (käyttäjänoikeus) - vapaa ohjelmisto, lisenssi GPLv3+.</string>
+    <string name="app_license">Copyleft (käyttäjänoikeus) - vapaa ohjelmisto, lisenssi GPLv3+</string>
     <string name="app_copyright_old">Perustuu Loyalty Card Keychain sovellukseen
-\ntekijänoikeus © 2016–2020 Branden Archer.</string>
-    <string name="app_copyright_fmt" tools:ignore="PluralsCandidate">Tekijänoikeus © 2019–<xliff:g>%d</xliff:g> Sylvia van Os.</string>
+\ntekijänoikeus © 2016–2020 Branden Archer</string>
+    <string name="app_copyright_fmt" tools:ignore="PluralsCandidate">Tekijänoikeus © 2019–<xliff:g>%d</xliff:g> Sylvia van Os</string>
     <string name="about">Tietoja</string>
     <string name="importOptionApplicationButton">Käytä toista sovellusta</string>
     <string name="importOptionApplicationExplanation">Käytä mitä tahansa sovellusta tai suosikkitiedostonhallintaasi tiedoston avaamiseen.</string>
@@ -103,23 +103,23 @@
     <string name="exportOptionExplanation">Tiedot kirjoitetaan valitsemaasi sijaintiin.</string>
     <string name="exporting">Viedään…</string>
     <string name="importing">Tuodaan…</string>
-    <string name="exportFailed">Kortteja ei voitu viedä</string>
+    <string name="exportFailed">Vienti epäonnistui</string>
     <string name="exportFailedTitle">Vienti epäonnistui</string>
     <string name="exportSuccessfulTitle">Vienti valmis</string>
-    <string name="importFailed">Kortteja ei voitu tuoda</string>
+    <string name="importFailed">Tuonti epäonnistui</string>
     <string name="importFailedTitle">Tuonti epäonnistui</string>
     <string name="importSuccessfulTitle">Tuonti valmis</string>
-    <string name="importExportHelp">Varmuuskopioimalla korttisi, voit siirtää ne toiseen laitteeseen.</string>
+    <string name="importExportHelp">Tietojesi varmuuskopiointi mahdollistaa niiden siirtämisen toiseen laitteeseen.</string>
     <string name="exportName">Vie</string>
     <string name="importExport">Tuo/Vie</string>
     <string name="failedParsingImportUriError">Tuonnin URI: n jäsentäminen epäonnistui</string>
-    <string name="noCardExistsError">Korttia ei löytynyt</string>
-    <string name="noCardIdError">Kortin ID-tunnusta ei annettu</string>
+    <string name="noCardExistsError">Tätä korttia ei löytynyt</string>
+    <string name="noCardIdError">ID-tunnusta ei annettu</string>
     <string name="noStoreError">Nimeä ei annettu</string>
-    <string name="card_ids_copied">Kopioidut korttitunnukset</string>
+    <string name="card_ids_copied">Kopioidut tunnukset</string>
     <string name="noCardsMessage">Lisää ensin kortti</string>
     <string name="cardShortcut">Kortin pikakuvake</string>
-    <string name="scanCardBarcode">Skannaa kortin viivakoodi</string>
+    <string name="scanCardBarcode">Skannaa viivakoodi</string>
     <string name="addCardTitle">Lisää kortti</string>
     <string name="editCardTitle">Muokkaa korttia</string>
     <string name="sendLabel">Lähetä…</string>
@@ -136,7 +136,7 @@
     <string name="unstar">Poista suosikeista</string>
     <string name="star">Lisää suosikkeihin</string>
     <string name="noBarcode">Ei viivakoodia</string>
-    <string name="barcodeNoBarcode">Tällä kortilla ei ole viivakoodia</string>
+    <string name="barcodeNoBarcode">Viivakoodia ei ole</string>
     <string name="barcodeType">Viivakoodin tyyppi</string>
     <string name="cardId">Kortin ID-tunnus</string>
     <string name="note">Lisätieto</string>
@@ -150,8 +150,8 @@
     <string name="setBackImage">Aseta takakuva</string>
     <string name="setFrontImage">Aseta etukuva</string>
     <string name="photos">Valokuvat</string>
-    <string name="backImageDescription">Kortin takakuva</string>
-    <string name="frontImageDescription">Kortin etukuva</string>
+    <string name="backImageDescription">Takakuva</string>
+    <string name="frontImageDescription">Etukuva</string>
     <string name="deleteConfirmation">Poista tämä kortti\?</string>
     <string name="deleteTitle">Poista kortti</string>
     <plurals name="deleteCardsConfirmation">
@@ -168,7 +168,7 @@
     </plurals>
     <string name="importStocard">Tuo Stocardista</string>
     <string name="importStocardMessage">Valitse tuotava <i>***-sync.zip</i>-vienti Stocardista.
-\nTai hanki se lähettämällä sähköpostia osoitteeseen support@stocardapp.com ja pyytämällä tietojesi vientiä.</string>
+\nHanki se lähettämällä sähköpostia osoitteeseen support@stocardapp.com ja pyytämällä tietojesi vientiä.</string>
     <string name="passwordRequired">Ole hyvä ja syötä salasana</string>
     <string name="failedGeneratingShareURL">Ei pystynyt luomaan jaettavaa URL-osoitetta. Ilmoita tästä.</string>
     <string name="turn_flashlight_on">Sytytä taskulamppu</string>
@@ -186,5 +186,49 @@
     <string name="settings_catima_theme">Catima</string>
     <string name="settings_system_locale">Järjestelmä</string>
     <string name="settings_locale">Kieli</string>
-    <string name="noGroupCards">Tämä ryhmä ei sisällä kortteja</string>
+    <string name="noGroupCards">Tämä ryhmä on tyhjä</string>
+    <string name="group_edit">Muokkaa ryhmää</string>
+    <string name="group_name_already_in_use">Ryhmän nimi on jo käytössä</string>
+    <string name="group_name_is_empty">Ryhmän nimi ei voi olla tyhjä</string>
+    <string name="group_updated">Ryhmä päivitetty</string>
+    <string name="editGroup">Muokataan ryhmää: <xliff:g>%s</xliff:g></string>
+    <plurals name="balancePoints">
+        <item quantity="one"><xliff:g>%s</xliff:g> piste</item>
+        <item quantity="other"><xliff:g>%s</xliff:g> pistettä</item>
+    </plurals>
+    <string name="settings_oled_dark">Musta tausta tummalle teemalle</string>
+    <string name="setIcon">Aseta kuvake</string>
+    <string name="swipeToSwitchImages">Vaihda kuvia pyyhkäisemällä tai painamalla pitkään</string>
+    <string name="sort_by_name">Nimi</string>
+    <string name="sort_by_most_recently_used">Viimeksi käytetyt</string>
+    <string name="sort_by_expiry">Viimeinen voimassaoloaika</string>
+    <string name="sort_by_balance">Saldo</string>
+    <string name="reverse">...käänteisessä järjestyksessä</string>
+    <string name="sort_by">Lajitteluperuste</string>
+    <string name="credits">Krediitit</string>
+    <string name="help_translate_this_app">Auta kääntämään tämä sovellus</string>
+    <string name="license">Lisenssi</string>
+    <string name="source_repository">Lähdekoodivarasto</string>
+    <string name="on_github">GitHubissa</string>
+    <string name="and_data_usage">ja datan käyttö</string>
+    <string name="on_google_play">Google Playssa</string>
+    <string name="report_error">Ilmoita virheestä</string>
+    <string name="action_show_details">Näytä tiedot</string>
+    <string name="action_hide_details">Piilota tiedot</string>
+    <string name="shortcutSelectCard">Valitse kortti</string>
+    <string name="starred">Tähdellä merkityt</string>
+    <string name="options">Vaihtoehdot</string>
+    <string name="set_scale">Säädä kokoa</string>
+    <string name="include_if_asking_support">Jos haluat pyytää tukea, ilmoita seuraavat tiedot:</string>
+    <string name="hideMoreInfo">Piilota tiedot</string>
+    <string name="exportPassword">Aseta salasana suojataksesi vientitiedostosi (valinnainen)</string>
+    <string name="exportPasswordHint">Syötä salasana</string>
+    <string name="showMoreInfo">Näytä tiedot</string>
+    <string name="version_history">Versiohistoria</string>
+    <string name="sort">Lajittele</string>
+    <string name="translate_platform">Weblatessa</string>
+    <string name="selectColor">Valitse väri</string>
+    <string name="rate_this_app">Arvostele tämä sovellus</string>
+    <string name="noGiftCardsGroup">Lisää kortteja ja lisää ne ryhmään täällä.</string>
+    <string name="barcodeImageDescriptionWithType">Image <xliff:g>%s</xliff:g> viivakoodi</string>
 </resources>

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

@@ -230,4 +230,5 @@
         <item quantity="other"><xliff:g>%s</xliff:g> punti</item>
     </plurals>
     <string name="settings_oled_dark">Sfondo nero puro per il tema scuro</string>
+    <string name="include_if_asking_support">Se vuoi richiedere supporto, includi le seguenti informazioni:</string>
 </resources>

app/src/main/res/values-pt-rPT/strings.xml

@@ -1,191 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources xmlns:tools="http://schemas.android.com/tools" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="shortcutSelectCard">Selecione um cartão</string>
-    <string name="action_show_details">Mostrar detalhes</string>
-    <string name="action_hide_details">Ocultar detalhes</string>
-    <string name="lockScreen">Bloquear rotação</string>
-    <string name="unlockScreen">Desbloquear rotação</string>
-    <string name="deleteTitle">Eliminar cartão</string>
-    <string name="deleteConfirmation">Eliminar este cartão permanentemente\?</string>
-    <string name="ok">OK</string>
-    <string name="copy_to_clipboard">Copiar identificador para a área de transferência</string>
-    <string name="share">Partilhar</string>
-    <string name="sendLabel">Enviar…</string>
-    <string name="editCardTitle">Editar cartão</string>
-    <string name="addCardTitle">Adicionar cartão</string>
-    <string name="cardShortcut">Atalho do cartão</string>
-    <string name="noCardsMessage">Adicione primeiro um cartão</string>
-    <string name="noStoreError">Nenhum nome inserido</string>
-    <string name="failedParsingImportUriError">Não foi possível analisar o URI de importação</string>
-    <string name="importExport">Importar / exportar</string>
-    <string name="exportName">Exportar</string>
-    <string name="importSuccessfulTitle">Importado</string>
-    <string name="importFailedTitle">A importação falhou</string>
-    <string name="exportSuccessfulTitle">Exportado</string>
-    <string name="exportFailedTitle">A exportação falhou</string>
-    <string name="importOptionFilesystemExplanation">Escolha um ficheiro específico a partir do sistema de ficheiros.</string>
-    <string name="importOptionApplicationTitle">Usar outra aplicação</string>
-    <string name="importOptionApplicationExplanation">Utilize qualquer aplicação ou o seu gestor de ficheiros favorito para abrir um ficheiro.</string>
-    <string name="importOptionApplicationButton">Utilizar outra aplicação</string>
-    <string name="about">Sobre</string>
-    <string name="app_copyright_fmt" tools:ignore="PluralsCandidate">Direitos de autor © 2019–<xliff:g>%d</xliff:g> Sylvia van Os</string>
-    <string name="app_copyright_old">Baseado no Loyalty Card Keychain
-\ndireitos de autor © 2016–2020 Branden Archer</string>
-    <string name="app_license">Software livre de partilha sob a mesma licença e segundo a licença GPLv3+</string>
-    <string name="about_title_fmt">Sobre o <xliff:g id="app_name">%s</xliff:g></string>
-    <string name="debug_version_fmt">Versão: <xliff:g id="version">%s</xliff:g></string>
-    <string name="app_revision_fmt">Informação da revisão: <xliff:g id="app_revision_url">%s</xliff:g></string>
-    <string name="app_libraries">Bibliotecas livres de terceiros: <xliff:g id="app_libraries_list">%s</xliff:g></string>
-    <string name="app_resources">Recursos livres de terceiros: <xliff:g id="app_resources_list">%s</xliff:g></string>
-    <string name="selectBarcodeTitle">Selecionar código de barras</string>
-    <string name="starImage">Favorito</string>
-    <string name="settings">Configurações</string>
-    <string name="settings_category_title_ui">Interface do utilizador</string>
-    <string name="settings_theme">Tema</string>
-    <string name="settings_system_theme">Sistema</string>
-    <string name="settings_light_theme">Claro</string>
-    <string name="settings_dark_theme">Escuro</string>
-    <string name="settings_max_font_size_scale">Tamanho máximo da fonte</string>
-    <string name="settings_display_barcode_max_brightness">Iluminar o código de barras</string>
-    <string name="settings_lock_barcode_orientation">Bloquear orientação do código de barras</string>
-    <string name="settings_keep_screen_on">Manter ecrã ligado</string>
-    <string name="group_name_is_empty">O nome do grupo não pode estar vazio</string>
-    <string name="group_updated">Grupo atualizado</string>
-    <string name="all">Todos</string>
-    <string name="deleteConfirmationGroup">Eliminar o grupo\?</string>
-    <string name="failedOpeningFileManager">Instalar primeiro um gestor de ficheiros.</string>
-    <string name="moveUp">Subir</string>
-    <string name="moveDown">Descer</string>
-    <string name="leaveWithoutSaveTitle">Sair</string>
-    <string name="leaveWithoutSaveConfirmation">Sair sem guardar\?</string>
-    <string name="addFromImage">Selecionar imagem da galeria</string>
-    <string name="groupsList">Grupos: <xliff:g>%s</xliff:g></string>
-    <string name="editGroup">A editar grupo: <xliff:g>%s</xliff:g></string>
-    <string name="expiryStateSentence">Expiram: <xliff:g>%s</xliff:g></string>
-    <string name="expiryStateSentenceExpired">Expirados: <xliff:g>%s</xliff:g></string>
-    <string name="balanceSentence">Saldo: <xliff:g>%s</xliff:g></string>
-    <string name="card">Cartão</string>
-    <string name="barcode">Código de barras</string>
-    <string name="editBarcode">Editar código de barras</string>
-    <string name="expiryDate">Validade</string>
-    <string name="never">Nunca</string>
-    <string name="chooseExpiryDate">Escolher validade</string>
-    <string name="moveBarcodeToTopOfScreen">Mover o código de barras para o topo do ecrã</string>
-    <string name="moveBarcodeToCenterOfScreen">Centrar o código de barras no ecrã</string>
-    <string name="noBarcodeFound">Não foi encontrado nenhum código de barras</string>
-    <string name="errorReadingImage">Não foi possível ler a imagem</string>
-    <string name="balance">Saldo</string>
-    <string name="currency">Moeda</string>
-    <string name="privacy_policy_popup_text">Aviso de política de privacidade (exigido por algumas lojas de aplicações):
-\n
-\nNENHUM DADO É RECOLHIDO DE FORMA ALGUMA, o que qualquer pessoa pode confirmar, já que a nossa aplicação é um software livre de código-fonte aberto.</string>
-    <string name="accept">Aceitar</string>
-    <string name="importCatima">Importar do Catima</string>
-    <string name="importFidme">Importar do FidMe</string>
-    <string name="importFidmeMessage">Selecione a exportação <i>fidme-export-request-xxxxxx.zip</i> do FidMe para importar e depois selecione os tipos de código de barras manualmente.
-\nPrimeiro crie a exportação no seu perfil do FidMe escolhendo a opção \"Proteção de dados\" e em seguida pressionando \"Extrair os meus dados\".</string>
-    <string name="importLoyaltyCardKeychain">Importar do Loyalty Card Keychain</string>
-    <string name="importLoyaltyCardKeychainMessage">Selecione a exportação <i>LoyaltyCardKeychain.csv</i> do Loyalty Card Keychain para importar.
-\nPrimeiro crie a exportação no menu \"Importar / exportar\" no Loyalty Card Keychain pressionando \"Exportar\".</string>
-    <string name="importStocard">Importar do Stocard</string>
-    <string name="importCatimaMessage">Selecione a exportação <i>catima.zip</i> do Catima a importar.
-\nPrimeiro crie a exportação no menu \"Importar / exportar\" de outra aplicação Catima pressionando \"Exportar\" nesse menu.</string>
-    <string name="importStocardMessage">Selecione a exportação <i>***-sync.zip</i> do Stocard para importar.
-\nObtenha-o através do e-mail support@stocardapp.com solicitando uma exportação dos seus dados.</string>
-    <string name="importVoucherVault">Importar do Voucher Vault</string>
-    <string name="importVoucherVaultMessage">Selecione a exportação <i>vouchervault.json</i> do Voucher Vault para importar.
-\nCrie-a primeiro pressionando a opção \"Exportar\" no Voucher Vault.</string>
-    <string name="barcodeId">Valor do código de barras</string>
-    <string name="setBarcodeId">Definir o valor do código de barras</string>
-    <string name="unsupportedBarcodeType">Este tipo de código de barras ainda não pode ser mostrado. Pode vir a ser suportado numa versão posterior da aplicação.</string>
-    <string name="wrongValueForBarcodeType">O valor não é válido para o tipo de código de barras selecionado</string>
-    <string name="intent_import_card_from_url_share_multiple_text">Quero partilhar alguns cartões</string>
-    <string name="photos">Fotografias</string>
-    <string name="setFrontImage">Definir imagem frontal</string>
-    <string name="setBackImage">Definir imagem de trás</string>
-    <string name="removeImage">Remover imagem</string>
-    <string name="takePhoto">Tirar uma fotografia</string>
-    <string name="updateBarcodeQuestionTitle">Atualizar o valor do código de barras\?</string>
-    <string name="yes">Sim</string>
-    <string name="no">Não</string>
-    <string name="passwordRequired">Introduza a palavra-passe</string>
-    <string name="exportPassword">Defina uma palavra-passe para proteger a exportação (opcional)</string>
-    <string name="exportPasswordHint">Digite a palavra-passe</string>
-    <string name="failedGeneratingShareURL">Não foi possível gerar uma URL partilhável. Por favor reporte isto aos programadores.</string>
-    <string name="turn_flashlight_on">Ligar lanterna</string>
-    <string name="turn_flashlight_off">Desligar lanterna</string>
-    <string name="settings_locale">Idioma</string>
-    <string name="settings_system_locale">Sistema</string>
-    <string name="selectColor">Selecionar cor</string>
-    <string name="setIcon">Definir ícone</string>
-    <string name="settings_violet_theme">Violeta</string>
-    <string name="settings_blue_theme">Azul</string>
-    <string name="settings_sky_blue_theme">Azul céu</string>
-    <string name="settings_green_theme">Verde</string>
-    <string name="settings_grey_theme">Cinzento</string>
-    <string name="settings_brown_theme">Castanho</string>
-    <string name="app_contributors">Tornado possível por: <xliff:g id="app_contributors">%s</xliff:g></string>
-    <string name="sort">Ordenar</string>
-    <string name="swipeToSwitchImages">Deslize ou pressione prolongadamente para mudar as imagens</string>
-    <string name="sort_by_name">Nome</string>
-    <string name="sort_by_most_recently_used">Mais usados recentemente</string>
-    <string name="sort_by_expiry">Validade</string>
-    <string name="sort_by_balance">Saldo</string>
-    <string name="sort_by">Ordenar por</string>
-    <string name="version_history">Histórico de versões</string>
-    <string name="credits">Créditos</string>
-    <string name="help_translate_this_app">Ajude a traduzir esta aplicação</string>
-    <string name="license">Licença</string>
-    <string name="source_repository">Repositório do código-fonte</string>
-    <string name="on_github">no GitHub</string>
-    <string name="and_data_usage">e utilização de dados</string>
-    <string name="rate_this_app">Avalie esta aplicação</string>
-    <string name="on_google_play">no Google Play</string>
-    <string name="report_error">Reportar erro</string>
-    <string name="translate_platform">no Weblate</string>
-    <plurals name="deleteCardsTitle">
-        <item quantity="one">Eliminar <xliff:g>%d</xliff:g> cartão</item>
-        <item quantity="other">Eliminar <xliff:g>%d</xliff:g> cartões</item>
-    </plurals>
-    <plurals name="deleteCardsConfirmation">
-        <item quantity="one">Eliminar o cartão <xliff:g>%d</xliff:g> permanentemente\?</item>
-        <item quantity="other">Eliminar os cartões <xliff:g>%d</xliff:g> permanentemente\?</item>
-    </plurals>
-    <plurals name="groupCardCount">
-        <item quantity="one"><xliff:g>%d</xliff:g> cartão</item>
-        <item quantity="other"><xliff:g>%d</xliff:g> cartões</item>
-    </plurals>
-    <string name="action_search">Pesquisa</string>
-    <string name="action_add">Acrescentar</string>
-    <string name="storeName">Nome</string>
-    <string name="note">Nota</string>
-    <string name="cardId">Identificador do cartão</string>
-    <string name="barcodeType">Tipo de código de barras</string>
-    <string name="noBarcode">Sem código de barras</string>
-    <string name="star">Adicionar aos favoritos</string>
-    <string name="unstar">Retirar dos favoritos</string>
-    <string name="cancel">Cancelar</string>
-    <string name="save">Guardar</string>
-    <string name="edit">Editar</string>
-    <string name="delete">Eliminar</string>
-    <string name="confirm">Confirmar</string>
-    <string name="importing">A importar…</string>
-    <string name="exporting">A exportar…</string>
-    <string name="exportOptionExplanation">Os dados serão guardados num local à sua escolha.</string>
-    <string name="importOptionFilesystemTitle">Importar do sistema de ficheiros</string>
-    <string name="importOptionFilesystemButton">Do sistema de ficheiros</string>
-    <string name="intent_import_card_from_url_share_text">Quero partilhar um cartão</string>
-    <string name="enter_group_name">Introduza o nome do grupo</string>
-    <string name="groups">Grupos</string>
-    <string name="group_edit">Editar grupo</string>
-    <string name="group_name_already_in_use">O nome do grupo já está a ser usado</string>
-    <string name="points">Pontos</string>
-    <string name="parsingBalanceFailed"><xliff:g>%s</xliff:g> não parece ser um saldo válido.</string>
-    <string name="chooseImportType">De onde importar os dados\?</string>
-    <string name="app_loyalty_card_keychain">Loyalty Card Keychain</string>
-    <string name="privacy_policy">Política de privacidade</string>
-    <string name="settings_theme_color">Cor do tema</string>
-    <string name="settings_catima_theme">Catima</string>
-    <string name="settings_pink_theme">Rosa</string>
-    <string name="settings_magenta_theme">Magenta</string>
-</resources>

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

@@ -228,4 +228,7 @@
         <item quantity="one"><xliff:g>%s</xliff:g> poäng</item>
         <item quantity="other"><xliff:g>%s</xliff:g> poäng</item>
     </plurals>
+    <string name="set_scale">Justera skala</string>
+    <string name="include_if_asking_support">Om du vill be om hjälp, inkludera då följande information:</string>
+    <string name="settings_oled_dark">Helsvart bakgrund för mörkt tema</string>
 </resources>

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

@@ -41,7 +41,7 @@
     <string name="accept">Прийняти</string>
     <string name="privacy_policy">Політика конфіденційності</string>
     <string name="app_loyalty_card_keychain">Loyalty Card Keychain</string>
-    <string name="chooseImportType">Імпортувати дані з\?</string>
+    <string name="chooseImportType">Імпортувати дані з</string>
     <string name="parsingBalanceFailed"><xliff:g>%s</xliff:g> здається, не є дійсним залишком.</string>
     <string name="points">Бали</string>
     <string name="currency">Валюта</string>
@@ -233,4 +233,12 @@
     <string name="starred">Обране</string>
     <string name="set_scale">Зміна масштабу</string>
     <string name="hideMoreInfo">Сховати дані</string>
+    <string name="settings_oled_dark">Повністю чорний фон для темної теми</string>
+    <plurals name="balancePoints">
+        <item quantity="one"><xliff:g>%s</xliff:g> бал</item>
+        <item quantity="few"><xliff:g>%s</xliff:g> бали</item>
+        <item quantity="many"><xliff:g>%s</xliff:g> балів</item>
+        <item quantity="other"><xliff:g>%s</xliff:g> балів</item>
+    </plurals>
+    <string name="include_if_asking_support">Якщо ви хочете отримати техпідтримку, додайте цю інформацію:</string>
 </resources>

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

@@ -115,6 +115,8 @@
     <string name="sharedpreference_sort" translatable="false">sharedpreference_sort</string>
     <string name="sharedpreference_sort_order" translatable="false">sharedpreference_sort_order</string>
     <string name="sharedpreference_sort_direction" translatable="false">sharedpreference_sort_direction</string>
+    <string name="sharedpreference_card_details" translatable="false">sharedpreference_card_details</string>
+    <string name="sharedpreference_card_details_show" translatable="false">sharedpreference_card_details_show</string>
     <string name="intent_import_card_from_url_share_text">I want to share a card with you</string>
     <string name="intent_import_card_from_url_host_catima_app" translatable="false">catima.app</string>
     <string name="intent_import_card_from_url_path_prefix_catima_app" translatable="false">/share</string>

fastlane/metadata/android/bg/short_description.txt

@@ -1 +1 @@
-За вашите щрихкодове, членства, програми за лоялност, талони и билети.
+За щрихкодове, членства, програми за лоялност, талони и билети.

fastlane/metadata/android/en-US/changelogs/104.txt

@@ -0,0 +1,2 @@
+- Save card detail expansion state
+- Minor UI fixes

fastlane/metadata/android/fi-FI/full_description.txt

@@ -1,4 +1,4 @@
-Lopeta muovisten palkintokorttien etsiminen kaupan tai verkkokaupan kassalla.
+Lopeta muovisten bonuskorttien etsiminen kaupan tai verkkokaupan kassalla.
 <b>Skannaa viivakoodit laitteeseesi sen kameran avulla, unohda kortit.</b>
 
 Unohda lompakko tai pidä se ultrakevyesti arvoesineitä varten.
@@ -20,4 +20,3 @@ Tämän välttämättömän jokapäiväisen kantamisen (EDC) välineen avulla vo
 
 Yksinkertaista elämääsi ja shoppailuasi, äläkä enää koskaan hukkaa paperikuittia, kaupassa maksettavaa lahjakorttia tai lentolippua.
 Ota kaikki palkintosi ja bonuksesi mukaasi ja säästä matkan aikana.
-

fastlane/metadata/android/fi-FI/short_description.txt

@@ -1 +1 @@
-Viivakoodeillesi, jäsenyyksillesi, kanta-asiakkkuuksillesi ja lipuillesi.
+Viivakoodeja, jäsenyyksiä, kanta-asiakasohjelmia, kuponkeja ja lippuja varten.

fastlane/metadata/android/fi-FI/title.txt

@@ -1 +1 @@
-Catima
+Catima — Kanta-asiakaskortit

fastlane/metadata/android/pt-PT/changelogs/11.txt

@@ -2,4 +2,4 @@
 - Limitada a largura dos códigos de barras gerados para reduzir o uso de memória e erros.
 - Alterado o botão "Introduzir cartão" para "Editar cartão" se já existir um identificador.
 - Alterado o esquema de cores para ser mais suave e compatível com o ícone da aplicação e disposição alterada ao visualizar um cartão.
-- Acrescentado um assistente de introdução que será lançado no primeiro lançamento da aplicação.
+- Acrescentado um assistente de introdução que será lançado no primeiro lançamento da aplicação

fastlane/metadata/android/tr-TR/changelogs/102.txt

@@ -1 +1,2 @@
 - Çeşitli küçük düzeltmeler
+- Norveççe çeviri kullanılırken oluşan çökme düzeltildi

fastlane/metadata/android/tr-TR/changelogs/103.txt

@@ -0,0 +1,2 @@
+- Elle dil seçiminin her yere uygulanmaması düzeltildi
+- Bölgesiz yerel ayarda düzenleme görünümündeki çökme düzeltildi

fastlane/metadata/android/tr-TR/changelogs/104.txt

@@ -0,0 +1 @@
+- Kart ayrıntısı genişletme durumunu kaydet

fastlane/metadata/android/uk/changelogs/100.txt

@@ -0,0 +1,2 @@
+- Кнопки пошуку та сортування карт приховано доки не з'явиться хоч одна карта
+- Різні правки тем

fastlane/metadata/android/uk/changelogs/101.txt

@@ -0,0 +1,3 @@
+- Тепер редактор зображень використовує колір теми
+- Виправлено незначні баги тем
+- Додано монотонно-чорну тему для OLED екранів