Release Catima 2.23.3

Translations update from Hosted Weblate

CHANGELOG.md

@@ -1,5 +1,16 @@
 # Changelog
 
+## v2.23.3 - 123
+
+- Minor UI improvements
+- Fix new design not being usable on devices with square screens
+
+## v2.23.2 - 122
+
+- Long-press card icon in view activity to change it
+- Improve button styling in Groups screen
+- Fix long barcode values causing barcode to scale down to nothing
+
 ## v2.23.1 - 121
 
 - Update used libraries

Gemfile.lock

@@ -8,16 +8,16 @@ GEM
     artifactory (3.0.15)
     atomos (0.1.3)
     aws-eventstream (1.2.0)
-    aws-partitions (1.749.0)
-    aws-sdk-core (3.171.0)
+    aws-partitions (1.771.0)
+    aws-sdk-core (3.173.1)
       aws-eventstream (~> 1, >= 1.0.2)
       aws-partitions (~> 1, >= 1.651.0)
       aws-sigv4 (~> 1.5)
       jmespath (~> 1, >= 1.6.1)
-    aws-sdk-kms (1.63.0)
+    aws-sdk-kms (1.64.0)
       aws-sdk-core (~> 3, >= 3.165.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-s3 (1.120.1)
+    aws-sdk-s3 (1.122.0)
       aws-sdk-core (~> 3, >= 3.165.0)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.4)
@@ -65,8 +65,8 @@ GEM
     faraday-retry (1.0.3)
     faraday_middleware (1.2.0)
       faraday (~> 1.0)
-    fastimage (2.2.6)
-    fastlane (2.212.2)
+    fastimage (2.2.7)
+    fastlane (2.213.0)
       CFPropertyList (>= 2.3, < 4.0.0)
       addressable (>= 2.8, < 3.0.0)
       artifactory (~> 3.0)
@@ -90,7 +90,7 @@ GEM
       json (< 3.0.0)
       jwt (>= 2.1.0, < 3)
       mini_magick (>= 4.9.4, < 5.0.0)
-      multipart-post (~> 2.0.0)
+      multipart-post (>= 2.0.0, < 3.0.0)
       naturally (~> 2.2)
       optparse (~> 0.1.1)
       plist (>= 3.1.0, < 4.0.0)
@@ -106,7 +106,7 @@ GEM
       xcpretty (~> 0.3.0)
       xcpretty-travis-formatter (>= 0.0.3)
     gh_inspector (1.1.3)
-    google-apis-androidpublisher_v3 (0.39.0)
+    google-apis-androidpublisher_v3 (0.42.0)
       google-apis-core (>= 0.11.0, < 2.a)
     google-apis-core (0.11.0)
       addressable (~> 2.5, >= 2.5.1)
@@ -155,7 +155,7 @@ GEM
     mini_magick (4.12.0)
     mini_mime (1.1.2)
     multi_json (1.15.0)
-    multipart-post (2.0.0)
+    multipart-post (2.3.0)
     nanaimo (0.3.0)
     naturally (2.2.1)
     optparse (0.1.1)

app/build.gradle

@@ -19,8 +19,8 @@ android {
         applicationId "me.hackerchick.catima"
         minSdk 21
         targetSdk 33
-        versionCode 121
-        versionName "2.23.1"
+        versionCode 123
+        versionName "2.23.3"
 
         vectorDrawables.useSupportLibrary true
         multiDexEnabled true

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

@@ -7,6 +7,7 @@ import android.database.sqlite.SQLiteDatabase;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
+import android.widget.Button;
 import android.widget.ImageButton;
 import android.widget.TextView;
 
@@ -84,7 +85,7 @@ public class GroupCursorAdapter extends BaseCursorAdapter<GroupCursorAdapter.Gro
 
     public static class GroupListItemViewHolder extends RecyclerView.ViewHolder {
         public TextView mName, mCardCount;
-        public ImageButton mMoveUp, mMoveDown, mEdit, mDelete;
+        public Button mMoveUp, mMoveDown, mEdit, mDelete;
 
         public GroupListItemViewHolder(GroupLayoutBinding groupLayoutBinding) {
             super(groupLayoutBinding.getRoot());

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

@@ -23,6 +23,7 @@ import android.view.LayoutInflater;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
+import android.view.ViewGroup;
 import android.view.ViewTreeObserver;
 import android.view.WindowManager;
 import android.widget.ArrayAdapter;
@@ -30,6 +31,7 @@ import android.widget.AutoCompleteTextView;
 import android.widget.Button;
 import android.widget.DatePicker;
 import android.widget.EditText;
+import android.widget.FrameLayout;
 import android.widget.ImageView;
 import android.widget.TextView;
 import android.widget.Toast;
@@ -98,6 +100,7 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity implements
     private final String STATE_FRONT_IMAGE_REMOVED = "frontImageRemoved";
     private final String STATE_BACK_IMAGE_REMOVED = "backImageRemoved";
     private final String STATE_ICON_REMOVED = "iconRemoved";
+    private final String STATE_OPEN_SET_ICON_MENU = "openSetIconMenu";
 
     private final String TEMP_CAMERA_IMAGE_NAME = LoyaltyCardEditActivity.class.getSimpleName() + "_camera_image.jpg";
     private final String TEMP_CROP_IMAGE_NAME = LoyaltyCardEditActivity.class.getSimpleName() + "_crop_image.png";
@@ -118,6 +121,7 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity implements
     public static final String BUNDLE_ID = "id";
     public static final String BUNDLE_DUPLICATE_ID = "duplicateId";
     public static final String BUNDLE_UPDATE = "update";
+    public static final String BUNDLE_OPEN_SET_ICON_MENU = "openSetIconMenu";
     public static final String BUNDLE_CARDID = "cardId";
     public static final String BUNDLE_BARCODEID = "barcodeId";
     public static final String BUNDLE_BARCODETYPE = "barcodeType";
@@ -152,6 +156,7 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity implements
     int loyaltyCardId;
     boolean updateLoyaltyCard;
     boolean duplicateFromLoyaltyCardId;
+    boolean openSetIconMenu;
     String cardId;
     String barcodeId;
     String barcodeType;
@@ -238,6 +243,8 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity implements
         updateLoyaltyCard = b != null && b.getBoolean(BUNDLE_UPDATE, false);
         duplicateFromLoyaltyCardId = b != null && b.getBoolean(BUNDLE_DUPLICATE_ID, false);
 
+        openSetIconMenu = b != null && b.getBoolean(BUNDLE_OPEN_SET_ICON_MENU, false);
+
         cardId = b != null ? b.getString(BUNDLE_CARDID) : null;
         barcodeId = b != null ? b.getString(BUNDLE_BARCODEID) : null;
         barcodeType = b != null ? b.getString(BUNDLE_BARCODETYPE) : null;
@@ -284,6 +291,7 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity implements
         savedInstanceState.putInt(STATE_FRONT_IMAGE_REMOVED, mFrontImageRemoved ? 1 : 0);
         savedInstanceState.putInt(STATE_BACK_IMAGE_REMOVED, mBackImageRemoved ? 1 : 0);
         savedInstanceState.putInt(STATE_ICON_REMOVED, mIconRemoved ? 1 : 0);
+        savedInstanceState.putInt(STATE_OPEN_SET_ICON_MENU, openSetIconMenu ? 1 : 0);
     }
 
     @Override
@@ -301,6 +309,7 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity implements
         mFrontImageRemoved = savedInstanceState.getInt(STATE_FRONT_IMAGE_REMOVED) == 1;
         mBackImageRemoved = savedInstanceState.getInt(STATE_BACK_IMAGE_REMOVED) == 1;
         mIconRemoved = savedInstanceState.getInt(STATE_ICON_REMOVED) == 1;
+        openSetIconMenu = savedInstanceState.getInt(STATE_OPEN_SET_ICON_MENU) == 1;
     }
 
     @Override
@@ -484,10 +493,19 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity implements
                     builder.setTitle(R.string.setBarcodeId);
                     final EditText input = new EditText(LoyaltyCardEditActivity.this);
                     input.setInputType(InputType.TYPE_CLASS_TEXT);
+
+                    FrameLayout container = new FrameLayout(LoyaltyCardEditActivity.this);
+                    FrameLayout.LayoutParams params = new FrameLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT);
+                    int contentPadding = getResources().getDimensionPixelSize(R.dimen.alert_dialog_content_padding);
+                    params.leftMargin = contentPadding;
+                    params.rightMargin = contentPadding;
+
+                    input.setLayoutParams(params);
+                    container.addView(input);
                     if (tempLoyaltyCard.barcodeId != null) {
                         input.setText(tempLoyaltyCard.barcodeId);
                     }
-                    builder.setView(input);
+                    builder.setView(container);
 
                     builder.setPositiveButton(getString(R.string.ok), (dialog, which) -> {
                         // If the user manually changes the barcode again make sure we disable the
@@ -897,6 +915,13 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity implements
         }
 
         onResuming = false;
+
+        // Fake click on the edit icon to cause the set icon option to pop up if the icon was
+        // long-pressed in the view activity
+        if (openSetIconMenu) {
+            openSetIconMenu = false;
+            thumbnail.callOnClick();
+        }
     }
 
     protected void setColorFromIcon() {

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

@@ -288,8 +288,8 @@ public class LoyaltyCardViewActivity extends CatimaAppCompatActivity implements
         binding.fabEdit.setOnClickListener(v -> {
             Intent intent = new Intent(getApplicationContext(), LoyaltyCardEditActivity.class);
             Bundle bundle = new Bundle();
-            bundle.putInt("id", loyaltyCardId);
-            bundle.putBoolean("update", true);
+            bundle.putInt(LoyaltyCardEditActivity.BUNDLE_ID, loyaltyCardId);
+            bundle.putBoolean(LoyaltyCardEditActivity.BUNDLE_UPDATE, true);
             intent.putExtras(bundle);
             startActivity(intent);
             finish();
@@ -301,6 +301,20 @@ public class LoyaltyCardViewActivity extends CatimaAppCompatActivity implements
         binding.bottomAppBarNextButton.setOnClickListener(view -> prevNextCard(true));
         binding.bottomAppBarUpdateBalanceButton.setOnClickListener(view -> showBalanceUpdateDialog());
 
+        binding.iconContainer.setOnClickListener(view -> Toast.makeText(LoyaltyCardViewActivity.this, R.string.icon_header_click_text, Toast.LENGTH_LONG).show());
+        binding.iconContainer.setOnLongClickListener(view -> {
+            Intent intent = new Intent(getApplicationContext(), LoyaltyCardEditActivity.class);
+            Bundle bundle = new Bundle();
+            bundle.putInt(LoyaltyCardEditActivity.BUNDLE_ID, loyaltyCardId);
+            bundle.putBoolean(LoyaltyCardEditActivity.BUNDLE_UPDATE, true);
+            bundle.putBoolean(LoyaltyCardEditActivity.BUNDLE_OPEN_SET_ICON_MENU, true);
+            intent.putExtras(bundle);
+            startActivity(intent);
+            finish();
+
+            return true;
+        });
+
         binding.mainImage.setOnClickListener(view -> onMainImageTap());
         // This long-press was originally only intended for when Talkback was used but sadly limiting
         // this doesn't seem to work well
@@ -327,16 +341,6 @@ public class LoyaltyCardViewActivity extends CatimaAppCompatActivity implements
         AlertDialog.Builder infoDialog = new MaterialAlertDialogBuilder(this);
 
         int dialogContentPadding = getResources().getDimensionPixelSize(R.dimen.alert_dialog_content_padding);
-        int dialogTitlePadding = getResources().getDimensionPixelSize(R.dimen.alert_dialog_title_padding);
-        TextView infoTitleView = new TextView(this);
-        infoTitleView.setPadding(
-                dialogContentPadding,
-                dialogContentPadding,
-                dialogContentPadding,
-                dialogTitlePadding
-        );
-        infoTitleView.setText(loyaltyCard.store);
-        infoDialog.setCustomTitle(infoTitleView);
         infoDialog.setTitle(loyaltyCard.store);
 
         TextView infoTextview = new TextView(this);
@@ -583,7 +587,7 @@ public class LoyaltyCardViewActivity extends CatimaAppCompatActivity implements
 
         loyaltyCardGroups = DBHelper.getLoyaltyCardGroups(database, loyaltyCardId);
 
-        setupOrientation();
+        showHideElementsForScreenSize();
 
         format = loyaltyCard.barcodeType;
         cardIdString = loyaltyCard.cardId;
@@ -591,6 +595,22 @@ public class LoyaltyCardViewActivity extends CatimaAppCompatActivity implements
 
         binding.cardIdView.setText(loyaltyCard.cardId);
 
+        // Display full text on click in case it doesn't fit in a single line
+        binding.cardIdView.setOnClickListener(v -> {
+            TextView cardIdView = new TextView(LoyaltyCardViewActivity.this);
+            cardIdView.setText(loyaltyCard.cardId);
+            cardIdView.setTextIsSelectable(true);
+            int contentPadding = getResources().getDimensionPixelSize(R.dimen.alert_dialog_content_padding);
+            cardIdView.setPadding(contentPadding, 0, contentPadding, 0);
+
+            AlertDialog.Builder builder = new MaterialAlertDialogBuilder(LoyaltyCardViewActivity.this);
+            builder.setTitle(R.string.cardId);
+            builder.setView(cardIdView);
+            builder.setPositiveButton(R.string.ok, (dialogInterface, i) -> dialogInterface.dismiss());
+            AlertDialog dialog = builder.create();
+            dialog.show();
+        });
+
         int backgroundHeaderColor;
         if (loyaltyCard.headerColor != null) {
             backgroundHeaderColor = loyaltyCard.headerColor;
@@ -743,8 +763,8 @@ public class LoyaltyCardViewActivity extends CatimaAppCompatActivity implements
         } else if (id == R.id.action_duplicate) {
             Intent intent = new Intent(getApplicationContext(), LoyaltyCardEditActivity.class);
             Bundle bundle = new Bundle();
-            bundle.putInt("id", loyaltyCardId);
-            bundle.putBoolean("duplicateId", true);
+            bundle.putInt(LoyaltyCardEditActivity.BUNDLE_ID, loyaltyCardId);
+            bundle.putBoolean(LoyaltyCardEditActivity.BUNDLE_DUPLICATE_ID, true);
             intent.putExtras(bundle);
             startActivity(intent);
 
@@ -799,13 +819,17 @@ public class LoyaltyCardViewActivity extends CatimaAppCompatActivity implements
         return super.onOptionsItemSelected(item);
     }
 
-    private void setupOrientation() {
+    private void showHideElementsForScreenSize() {
         int orientation = getResources().getConfiguration().orientation;
-        if (orientation == Configuration.ORIENTATION_LANDSCAPE) {
-            Log.d(TAG, "Detected landscape mode");
+        // Detect square-ish screens like the Unihertz Titan
+        boolean isSmallHeight = getResources().getDisplayMetrics().heightPixels < (getResources().getDisplayMetrics().widthPixels * 1.5);
+
+        // Treat sqaure-ish screens as
+        if (orientation == Configuration.ORIENTATION_LANDSCAPE || isSmallHeight) {
+            Log.d(TAG, "Detected landscape mode or square-ish screen");
             binding.iconContainer.setVisibility(View.GONE);
         } else {
-            Log.d(TAG, "Detected portrait mode");
+            Log.d(TAG, "Detected portrait mode on non square-ish screen");
             binding.iconContainer.setVisibility(View.VISIBLE);
         }
 

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

@@ -150,8 +150,9 @@ public class ManageGroupsActivity extends CatimaAppCompatActivity implements Gro
                 ViewGroup.LayoutParams.MATCH_PARENT,
                 ViewGroup.LayoutParams.WRAP_CONTENT
         );
-        params.leftMargin = 50;
-        params.rightMargin = 50;
+        int contentPadding = getResources().getDimensionPixelSize(R.dimen.alert_dialog_content_padding);
+        params.leftMargin = contentPadding;
+        params.rightMargin = contentPadding;
         input.setLayoutParams(params);
         container.addView(input);
 

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

@@ -37,36 +37,48 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content">
 
-        <ImageButton
+        <Button
             android:id="@+id/moveUp"
-            android:layout_width="@dimen/cardThumbnailSize"
-            android:layout_height="@dimen/cardThumbnailSize"
+            style="?attr/materialIconButtonFilledStyle"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
             android:layout_weight="1"
-            app:srcCompat="@drawable/ic_baseline_arrow_drop_up_24"
+            app:icon="@drawable/ic_baseline_arrow_drop_up_24"
+            app:iconGravity="textStart"
+            app:tint="?attr/colorOnPrimary"
             android:contentDescription="@string/moveUp"/>
 
-        <ImageButton
+        <Button
             android:id="@+id/moveDown"
-            android:layout_width="@dimen/cardThumbnailSize"
-            android:layout_height="@dimen/cardThumbnailSize"
+            style="?attr/materialIconButtonFilledStyle"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
             android:layout_weight="1"
-            app:srcCompat="@drawable/ic_baseline_arrow_drop_down_24"
+            app:icon="@drawable/ic_baseline_arrow_drop_down_24"
+            app:iconGravity="textStart"
+            app:tint="?attr/colorOnPrimary"
             android:contentDescription="@string/moveDown"/>
 
-        <ImageButton
+        <Button
             android:id="@+id/edit"
-            android:layout_width="@dimen/cardThumbnailSize"
-            android:layout_height="@dimen/cardThumbnailSize"
+            style="?attr/materialIconButtonFilledStyle"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
             android:layout_weight="1"
-            app:srcCompat="@drawable/ic_mode_edit_white_24dp"
+            app:icon="@drawable/ic_mode_edit_white_24dp"
+            app:iconGravity="textStart"
+            app:tint="?attr/colorOnPrimary"
             android:contentDescription="@string/edit"/>
 
-        <ImageButton
+        <Button
             android:id="@+id/delete"
-            android:layout_width="@dimen/cardThumbnailSize"
-            android:layout_height="@dimen/cardThumbnailSize"
+            style="?attr/materialIconButtonFilledStyle"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
             android:layout_weight="1"
-            app:srcCompat="@drawable/ic_delete_white_24dp"
+            app:icon="@drawable/ic_delete_white_24dp"
+            app:iconGravity="textStart"
+            app:tint="?attr/colorOnPrimary"
             android:contentDescription="@string/delete"/>
 
     </LinearLayout>

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

@@ -165,6 +165,7 @@
             android:id="@+id/balance"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
+            android:gravity="center_vertical"
             android:layout_marginStart="8dp"
             android:layout_marginEnd="8dp"
             android:layout_marginBottom="4dp"
@@ -184,6 +185,7 @@
             android:id="@+id/validFrom"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
+            android:gravity="center_vertical"
             android:layout_marginStart="8dp"
             android:layout_marginEnd="8dp"
             android:layout_marginBottom="4dp"
@@ -203,6 +205,7 @@
             android:id="@+id/expiry"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
+            android:gravity="center_vertical"
             android:layout_marginStart="8dp"
             android:layout_marginEnd="8dp"
             android:layout_marginBottom="4dp"

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

@@ -125,6 +125,8 @@
                                 android:layout_width="match_parent"
                                 android:layout_height="wrap_content"
                                 android:textSize="@dimen/text_size_large"
+                                android:ellipsize="end"
+                                android:singleLine="true"
                                 android:gravity="center"/>
                     </LinearLayout>
                 </com.google.android.material.card.MaterialCardView>

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

@@ -15,7 +15,7 @@
             android:layout_marginLeft="20dp"
             android:paddingLeft="20dp"
             android:text="@string/reverse"
-            android:textSize="19sp"/>
+            android:textSize="16sp"/>
 
     </LinearLayout>
-</androidx.constraintlayout.widget.ConstraintLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>

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

@@ -28,17 +28,19 @@ Sergio Paredes
 Aayush Gupta
 huuhaa
 Quentin PAGÈS
+(Cliff Heraldo)
 Alexander Ivanov
 arshbeerSingh
+Balázs Meskó
 Denis Shilin
 Freddo espresso
+Giovanni Donisi
 Projjal Moitra
 Silvério Santos
 Miha Frangež
 Arnis Jaundžeikars
 Kefir2105
 sr093906
-Giovanni Donisi
 mdvhimself
 Katarzyna
 echo r"0xX4H" | rev
@@ -46,13 +48,12 @@ Magnitudee
 Olivia (Zoe)
 betsythefc
 waffshappen
-(Cliff Heraldo)
 Robin
 Eric
 ati3
-Balázs Meskó
 Evgeniy Khramov
 Jane Kong
+Jean Mareilles
 Jiri Grönroos
 K. Herbert
 Lisa A.
@@ -64,6 +65,7 @@ Tapu
 Yurical
 Eryk Michalak
 rr-vesp
+丛林意志
 alajemba-vik
 /usr/local/ΕΨΗΕΛΩΝ
 Adolfo Jayme-Barrientos
@@ -76,6 +78,7 @@ BootVirtual
 Clonewayx
 D. Domig
 Diego
+Eudes-alencar
 Fede Pujol
 francescbassas
 Jean-Luc Tibaux
@@ -85,6 +88,7 @@ Luna Jernberg
 Marnick L'Eau
 Michalis
 Michał
+Milo Ivir
 Mohamed A. Salah
 the7thNightmare
 Rishi Agarwal
@@ -120,6 +124,7 @@ Alexander
 sNiXx
 Angela Enogieru
 AnimeshChatterjee1
+Artūras Kalenda
 Ashish Yadav
 Aya Elsaadany
 Biren
@@ -133,6 +138,7 @@ Mylou53
 danieluhrinyi
 Kasina Dheeraj
 Donno
+FC Stegerman
 Flav
 Franciszek Stefan
 Gael Caraballo
@@ -143,7 +149,6 @@ HowITsDone
 Izzy
 Jacek
 Jacopo Gennaro Esposito
-Jean Mareilles
 Jean-Baptiste
 Kung-chih
 Karvjorm
@@ -153,10 +158,12 @@ Lucas da Costa
 Manan Jhaveri
 Marco
 BRBsoup
+Mateo Gomez
 Mattia
 Md. Al-Amin
 Michael Gangolf
 3DN1M
+Minecraft boom
 Mobashir Raihan
 Moi Toi
 DivideEtImpera
@@ -177,6 +184,7 @@ SKULD
 Salem Malus
 Samarth Asthan
 Shailendra Maurya
+SilverFS
 Simone Dotto
 Subhashish Anand
 Subhradeep Bera
@@ -187,6 +195,7 @@ atakujonc
 Tony C
 Tymofii Lytvynenko
 Vancha March
+Waldemar Stoczkowski
 Yevgeny M
 Yusril A
 ahmed-awad26

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

@@ -0,0 +1,56 @@
+<?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="storeName">Nome</string>
+    <string name="note">Nota</string>
+    <string name="noMatchingGiftCards">Nun hai nengún resultáu. Prueba a camudar la busca.</string>
+    <string name="barcodeType">Tipu de códigu de barres</string>
+    <string name="noBarcode">Ensin códigu de barres</string>
+    <string name="star">Meter en Favoritos</string>
+    <string name="confirm">Confirmar</string>
+    <string name="deleteConfirmation">¿Quies desaniciar esta tarxeta permanentemente\?</string>
+    <string name="importExport">Importar/Esportar</string>
+    <string name="noCardIdError">Nun s\'introduxo nenguna ID</string>
+    <string name="exportFailed">Num se pudo facer la esportación</string>
+    <string name="importFailedTitle">La importación falló</string>
+    <string name="exportOptionExplanation">Los datos escríbense nel llugar qu\'escueyas.</string>
+    <string name="app_license">Software llibre llicenciao cola GPLv3+</string>
+    <string name="action_search">Buscar</string>
+    <string name="action_add">Amestar</string>
+    <plurals name="selectedCardCount">
+        <item quantity="one"><xliff:g>%d</xliff:g> na seleición</item>
+        <item quantity="other"><xliff:g>%d</xliff:g> na seleición</item>
+    </plurals>
+    <string name="noGiftCards">Calca\'l botón «+» p\'amestar una tarxeta o impórtales dende\'l menú «⋮».</string>
+    <string name="cardId">ID</string>
+    <string name="barcodeNoBarcode">Nun hai nengún códigu de barres</string>
+    <string name="save">Guardar</string>
+    <string name="edit">Editar</string>
+    <string name="delete">Desaniciar</string>
+    <plurals name="deleteCardsTitle">
+        <item quantity="one"></item>
+        <item quantity="other"></item>
+    </plurals>
+    <string name="unstar">Quitar de Favoritos</string>
+    <string name="cancel">Encaboxar</string>
+    <string name="importFailed">Nun se pudo facer la importación</string>
+    <string name="noCardExistsError">Nun se pudo atopar esa tarxeta</string>
+    <string name="all">Too</string>
+    <string name="noStoreError">Nun s\'introduxo nengún nome</string>
+    <string name="sendLabel">Unviar…</string>
+    <string name="editCardTitle">Editar la tarxeta</string>
+    <string name="ok">D\'acuerdu</string>
+    <string name="exportFailedTitle">La esportación falló</string>
+    <string name="noCameraPermissionDirectToSystemSetting">Pa escaniar códigos de barres, Catima tien d\'acceder a la cámara. Toca equí pa camudar la configuración de los permisos.</string>
+    <string name="debug_version_fmt">Versión: <xliff:g id="version">%s</xliff:g></string>
+    <string name="importing">Importando…</string>
+    <string name="exporting">Esportando…</string>
+    <string name="storageReadPermissionRequired">Esta aición precisa\'l permisu pa lleer l\'almacenamientu…</string>
+    <string name="cameraPermissionRequired">Esta aición precisa l\'accesu a la cámara…</string>
+    <string name="cameraPermissionDeniedTitle">Nun se pudo acceder a la cámara</string>
+    <string name="app_copyright_fmt" tools:ignore="PluralsCandidate">Copyright © 2019–<xliff:g>%d</xliff:g> Sylvia van Os</string>
+    <string name="app_copyright_old">Básase en Loyalty Card Keychain
+\ncopyright © 2016–2020 Branden Archer</string>
+    <string name="thumbnailDescription">Miniatura</string>
+    <string name="settings">Configuración</string>
+    <string name="settings_theme">Estilu</string>
+</resources>

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

@@ -83,9 +83,9 @@
     <string name="groups">Списъци</string>
     <string name="enter_group_name">Въведете име на списъка</string>
     <string name="intent_import_card_from_url_share_text">Искам да споделя тази карта с вас</string>
-    <string name="settings_display_barcode_max_brightness">Увеличаване на яркостта при видим щрихкод</string>
-    <string name="settings_keep_screen_on">Поддържане на екрана включен</string>
-    <string name="settings_disable_lockscreen_while_viewing_card">Предотвратяване на заключване на екрана</string>
+    <string name="settings_display_barcode_max_brightness">Максимална яркост при видим щрихкод</string>
+    <string name="settings_keep_screen_on">Без изключване на екрана</string>
+    <string name="settings_disable_lockscreen_while_viewing_card">Без заключване на екрана</string>
     <string name="settings_dark_theme">Тъмна</string>
     <string name="settings_light_theme">Светла</string>
     <string name="settings_system_theme">Системна</string>
@@ -196,8 +196,8 @@
     <string name="and_data_usage">и използване на данни</string>
     <string name="help_translate_this_app">Помогнете за превода на приложението</string>
     <string name="exportPasswordHint">Въведете парола</string>
-    <string name="exportPassword">Задаване на парола за защита на изнесеното (по избор)</string>
-    <string name="setIcon">Задаване на пиктограма</string>
+    <string name="exportPassword">Защитете архива с парола (по желание)</string>
+    <string name="setIcon">Задаване на значка</string>
     <string name="editGroup">Променяне на списъка: <xliff:g>%s</xliff:g></string>
     <string name="group_name_already_in_use">Има списък с това име</string>
     <string name="group_updated">Промените са запазени</string>
@@ -217,13 +217,13 @@
         <item quantity="one"><xliff:g>%s</xliff:g> точка</item>
         <item quantity="other"><xliff:g>%s</xliff:g> точки</item>
     </plurals>
-    <string name="settings_oled_dark">Чисто черен фон за тъмната тема</string>
+    <string name="settings_oled_dark">Черен фон за тъмната тема</string>
     <string name="include_if_asking_support">Ако искате да потърсите поддръжка, включете следната информация:</string>
-    <string name="settings_card_orientation">Положение на щрихкода</string>
+    <string name="settings_card_orientation">Завъртане на щрихкода</string>
     <string name="settings_follow_system_orientation">Според системата</string>
-    <string name="settings_portrait_orientation">Портретно</string>
-    <string name="settings_landscape_orientation">Пейзажно</string>
-    <string name="settings_lock_on_opening_orientation">Използване на положението, използвано при отваряне на картата</string>
+    <string name="settings_portrait_orientation">Портрет</string>
+    <string name="settings_landscape_orientation">Пейзаж</string>
+    <string name="settings_lock_on_opening_orientation">Като при отваряне на картата</string>
     <string name="duplicateCard">Дублиране</string>
     <string name="archive">Архивиране</string>
     <string name="unarchive">Изваждане от архива</string>
@@ -268,4 +268,5 @@
     <string name="openBackImageInGalleryApp">Отваряне на изображението на задната страна в приложението галерия</string>
     <string name="setBarcodeHeight">Задаване на височина на щрихкода</string>
     <string name="donate">Даряване</string>
+    <string name="icon_header_click_text">Задръжте, за да промените значката</string>
 </resources>

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

@@ -275,4 +275,5 @@
     <string name="openBackImageInGalleryApp">Otevřít zadní obrázek v galerii</string>
     <string name="setBarcodeHeight">Nastavit výšku čárového kódu</string>
     <string name="donate">Přispět</string>
+    <string name="icon_header_click_text">Dlouhým stisknutím ikonu upravíte</string>
 </resources>

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

@@ -275,4 +275,5 @@
     <string name="openBackImageInGalleryApp">Ouvrir l\'image arrière dans l\'application galerie</string>
     <string name="setBarcodeHeight">Définir la hauteur du code-barres</string>
     <string name="donate">Faire un don</string>
+    <string name="icon_header_click_text">Pressez longtemps pour éditer l\'icône</string>
 </resources>

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

@@ -268,4 +268,5 @@
     <string name="openBackImageInGalleryApp">Hátulnézeti kép megnyitása a galéria alkalmazásban</string>
     <string name="openFrontImageInGalleryApp">Elölnézeti kép megnyitása a galéria alkalmazásban</string>
     <string name="setBarcodeHeight">Vonalkód magasságának megadása</string>
+    <string name="icon_header_click_text">Hosszú nyomás az ikon szerkesztéséhez</string>
 </resources>

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

@@ -29,7 +29,7 @@
     <string name="failedParsingImportUriError">Kan de import-uri niet verwerken</string>
     <string name="importExport">Importeren/Exporteren</string>
     <string name="exportName">Exporteren</string>
-    <string name="importExportHelp">Door je gegevens te back-uppen, kun je ze overzetten naar een ander apparaat.</string>
+    <string name="importExportHelp">Met een reservekopie van je gegevens kun je ze overzetten naar een ander apparaat.</string>
     <string name="importSuccessfulTitle">Importeren voltooid</string>
     <string name="importFailedTitle">Importeren mislukt</string>
     <string name="importFailed">Het importeren is mislukt</string>
@@ -268,4 +268,5 @@
     <string name="openFrontImageInGalleryApp">Voorzijde openen in galerij-app</string>
     <string name="openBackImageInGalleryApp">Achterzijde openen in galerij-app</string>
     <string name="donate">Doneren</string>
+    <string name="icon_header_click_text">Houd lang ingedrukt om pictogram te bewerken</string>
 </resources>

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

@@ -281,4 +281,6 @@
     <string name="openFrontImageInGalleryApp">Otwórz obraz z przodu w aplikacji galeria</string>
     <string name="setBarcodeHeight">Ustaw wysokość kodu kreskowego</string>
     <string name="donate">Darowizna</string>
-</resources>
+    <string name="openBackImageInGalleryApp">Otwórz obraz z powrotem w aplikacji galerii</string>
+    <string name="icon_header_click_text">Przytrzymaj, aby edytować ikonę</string>
+</resources>

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

@@ -282,4 +282,5 @@
     <string name="openFrontImageInGalleryApp">Открыть лицевое изображение в приложении галереи</string>
     <string name="openBackImageInGalleryApp">Открыть заднее изображение в приложении галереи</string>
     <string name="donate">Пожертвовать</string>
+    <string name="icon_header_click_text">Долгое нажатие для редактирования значка</string>
 </resources>

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

@@ -268,4 +268,5 @@
     <string name="setBarcodeHeight">Barkod yüksekliğini ayarla</string>
     <string name="openFrontImageInGalleryApp">Ön resmi galeri uygulamasında aç</string>
     <string name="openBackImageInGalleryApp">Arka resmi galeri uygulamasında aç</string>
+    <string name="icon_header_click_text">Simgeyi düzenlemek için uzun basın</string>
 </resources>

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

@@ -40,7 +40,7 @@
     <string name="importCatima">Імпорт з Catima</string>
     <string name="accept">Прийняти</string>
     <string name="privacy_policy">Політика конфіденційності</string>
-    <string name="app_loyalty_card_keychain">Loyalty Card Keychain</string>
+    <string name="app_loyalty_card_keychain">Брелок для картки лояльності</string>
     <string name="chooseImportType">Імпортувати дані з</string>
     <string name="parsingBalanceFailed"><xliff:g>%s</xliff:g> здається, не є дійсним залишком.</string>
     <string name="points">Бали</string>
@@ -274,4 +274,12 @@
     <string name="anyDate">Будь-яка дата</string>
     <string name="chooseValidFromDate">Виберіть термін дії з дати</string>
     <string name="validFromSentence">Дійсний від: <xliff:g>%s</xliff:g></string>
+    <string name="switchToFrontImage">Перемкнутися на лицьову сторону</string>
+    <string name="switchToBackImage">Перемкнутися на зворотню сторону</string>
+    <string name="switchToBarcode">Перемкнутися на штрих-код</string>
+    <string name="openFrontImageInGalleryApp">Відкрити зображення лицьової сторони у додату галереї</string>
+    <string name="openBackImageInGalleryApp">Відкрити зображення тильної сторони у додатку галереї</string>
+    <string name="setBarcodeHeight">Встановити висоту штрих-коду</string>
+    <string name="height">Висота:</string>
+    <string name="donate">Пожертвувати</string>
 </resources>

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

@@ -313,4 +313,5 @@
     <string name="openBackImageInGalleryApp">Open back image in gallery app</string>
     <string name="setBarcodeHeight">Set barcode height</string>
     <string name="donate">Donate</string>
+    <string name="icon_header_click_text">Long press to edit icon</string>
 </resources>

fastlane/metadata/android/ast/title.txt

@@ -0,0 +1 @@
+Catima - Cartera de tarxetes de fidelización

fastlane/metadata/android/cs-CZ/changelogs/121.txt

@@ -0,0 +1 @@
+- Aktualizace používaných knihoven

fastlane/metadata/android/cs-CZ/changelogs/122.txt

@@ -0,0 +1,2 @@
+- Změna ikony karty v pohledu aktivity dlouhým stisknutím ikony
+- Vylepšení stylu tlačítek na obrazovce Skupiny

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

@@ -0,0 +1,3 @@
+- Long-press card icon in view activity to change it
+- Improve button styling in Groups screen
+- Fix long barcode values causing barcode to scale down to nothing

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

@@ -0,0 +1,2 @@
+- Minor UI improvements
+- Fix new design not being usable on devices with square screens

fastlane/metadata/android/id/changelogs/121.txt

@@ -0,0 +1 @@
+- Pembaruan perpustakaan yang digunakan

fastlane/metadata/android/id/changelogs/122.txt

@@ -0,0 +1,3 @@
+- Ikon kartu tekan lama dalam aktivitas tampilan untuk mengubahnya
+- Tingkatkan gaya tombol di layar Grup
+- Perbaiki nilai barcode panjang yang menyebabkan barcode turun menjadi kosong

fastlane/metadata/android/ru-RU/changelogs/121.txt

@@ -0,0 +1 @@
+- Обновление используемых библиотек

fastlane/metadata/android/ru-RU/changelogs/122.txt

@@ -0,0 +1,3 @@
+- Редактирование значка карты длительным нажатием на него в режиме просмотра
+- Улучшение стиля кнопок на экране групп
+- Исправление длинных значений штрих-кода, из-за которых штрих-код уменьшался до нуля

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

@@ -0,0 +1 @@
+- Оновленно використовувані бібліотеки