Release 1.5.0

Translations update from Weblate

CHANGELOG.md

@@ -1,5 +1,12 @@
 # Changelog
 
+## v1.5.0 (2020-12-03)
+
+Changes:
+
+- Improve contrast by always using white text on red buttons
+- Draggable bottom sheet in loyalty card view
+
 ## v1.4.1 (2020-12-01)
 
 Changes:

app/build.gradle

@@ -11,10 +11,10 @@ android {
 
     defaultConfig {
         applicationId "me.hackerchick.catima"
-        minSdkVersion 16
+        minSdkVersion 19
         targetSdkVersion 29
-        versionCode 49
-        versionName "1.4.1"
+        versionCode 50
+        versionName "1.5.0"
         vectorDrawables.useSupportLibrary = true
     }
     buildTypes {

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

@@ -191,14 +191,7 @@ public class BarcodeSelectorActivity extends AppCompatActivity
                     public void onGlobalLayout()
                     {
                         Log.d(TAG, "Global layout finished, type: + " + formatType + ", width: " + image.getWidth());
-                        if (Build.VERSION.SDK_INT < 16)
-                        {
-                            image.getViewTreeObserver().removeGlobalOnLayoutListener(this);
-                        }
-                        else
-                        {
-                            image.getViewTreeObserver().removeOnGlobalLayoutListener(this);
-                        }
+                        image.getViewTreeObserver().removeOnGlobalLayoutListener(this);
 
                         Log.d(TAG, "Generating barcode for type " + formatType);
                         BarcodeImageWriterTask task = new BarcodeImageWriterTask(image, cardId, format, text);

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

@@ -287,7 +287,7 @@ public class ImportExportActivity extends AppCompatActivity
         }
         catch (ActivityNotFoundException e)
         {
-            Toast.makeText(getApplicationContext(), R.string.failedOpeningFileManager, Toast.LENGTH_LONG);
+            Toast.makeText(getApplicationContext(), R.string.failedOpeningFileManager, Toast.LENGTH_LONG).show();
             Log.e(TAG, "No activity found to handle intent", e);
         }
     }

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

@@ -15,14 +15,11 @@ import protect.card_locker.preferences.Settings;
 class LoyaltyCardCursorAdapter extends CursorAdapter
 {
     Settings settings;
-    boolean darkModeEnabled;
 
     public LoyaltyCardCursorAdapter(Context context, Cursor cursor)
     {
         super(context, cursor, 0);
         settings = new Settings(context);
-        darkModeEnabled= MainActivity.isDarkModeEnabled(context);
-
     }
 
     // The newView method is used to inflate a new view and return it,
@@ -44,11 +41,6 @@ class LoyaltyCardCursorAdapter extends CursorAdapter
         TextView noteField = view.findViewById(R.id.note);
         ImageView star = view.findViewById(R.id.star);
 
-        if(darkModeEnabled)
-        {
-            star.setColorFilter(Color.WHITE, PorterDuff.Mode.SRC_ATOP);
-        }
-
         // Extract properties from cursor
         LoyaltyCard loyaltyCard = LoyaltyCard.toLoyaltyCard(cursor);
 

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

@@ -590,11 +590,7 @@ public class LoyaltyCardEditActivity extends AppCompatActivity
                     new ViewTreeObserver.OnGlobalLayoutListener() {
                         @Override
                         public void onGlobalLayout() {
-                            if (Build.VERSION.SDK_INT < 16) {
-                                barcodeImage.getViewTreeObserver().removeGlobalOnLayoutListener(this);
-                            } else {
-                                barcodeImage.getViewTreeObserver().removeOnGlobalLayoutListener(this);
-                            }
+                            barcodeImage.getViewTreeObserver().removeOnGlobalLayoutListener(this);
 
                             Log.d(TAG, "ImageView size now known");
                             new BarcodeImageWriterTask(barcodeImage, cardId, barcodeFormat).execute();

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

@@ -7,6 +7,7 @@ import android.graphics.drawable.Drawable;
 import android.os.Build;
 import android.os.Bundle;
 
+import androidx.annotation.NonNull;
 import androidx.constraintlayout.widget.ConstraintLayout;
 import androidx.core.graphics.drawable.DrawableCompat;
 import androidx.core.widget.TextViewCompat;
@@ -27,9 +28,12 @@ import android.widget.ImageView;
 import android.widget.TextView;
 import android.widget.Toast;
 
+import com.google.android.material.bottomsheet.BottomSheetBehavior;
 import com.google.android.material.floatingactionbutton.FloatingActionButton;
 import com.google.zxing.BarcodeFormat;
 
+import java.util.List;
+
 import protect.card_locker.preferences.Settings;
 
 public class LoyaltyCardViewActivity extends AppCompatActivity
@@ -37,8 +41,10 @@ public class LoyaltyCardViewActivity extends AppCompatActivity
     private static final String TAG = "Catima";
 
     TextView cardIdFieldView;
+    View bottomSheet;
+    ImageView bottomSheetButton;
     TextView noteView;
-    View noteViewDivider;
+    TextView groupsView;
     TextView storeName;
     ImageView barcodeImage;
     View collapsingToolbarLayout;
@@ -103,8 +109,10 @@ public class LoyaltyCardViewActivity extends AppCompatActivity
         importURIHelper = new ImportURIHelper(this);
 
         cardIdFieldView = findViewById(R.id.cardIdView);
+        bottomSheet = findViewById(R.id.bottom_sheet);
+        bottomSheetButton = findViewById(R.id.bottomSheetButton);
         noteView = findViewById(R.id.noteView);
-        noteViewDivider = findViewById(R.id.noteViewDivider);
+        groupsView = findViewById(R.id.groupsView);
         storeName = findViewById(R.id.storeName);
         barcodeImage = findViewById(R.id.barcode);
         collapsingToolbarLayout = findViewById(R.id.collapsingToolbarLayout);
@@ -125,6 +133,50 @@ public class LoyaltyCardViewActivity extends AppCompatActivity
                 }
             }
         });
+
+        final FloatingActionButton editButton = findViewById(R.id.fabEdit);
+        editButton.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                Intent intent = new Intent(getApplicationContext(), LoyaltyCardEditActivity.class);
+                Bundle bundle = new Bundle();
+                bundle.putInt("id", loyaltyCardId);
+                bundle.putBoolean("update", true);
+                intent.putExtras(bundle);
+                startActivity(intent);
+                finish();
+            }
+        });
+
+        final BottomSheetBehavior behavior = BottomSheetBehavior.from(bottomSheet);
+        behavior.addBottomSheetCallback(new BottomSheetBehavior.BottomSheetCallback() {
+            @Override
+            public void onStateChanged(@NonNull View bottomSheet, int newState) {
+                if (newState == BottomSheetBehavior.STATE_DRAGGING) {
+                    editButton.hide();
+                } else if (newState == BottomSheetBehavior.STATE_EXPANDED) {
+                    bottomSheetButton.setImageResource(R.drawable.ic_baseline_arrow_drop_down_24);
+                    editButton.hide();
+                } else if (newState == BottomSheetBehavior.STATE_COLLAPSED) {
+                    bottomSheetButton.setImageResource(R.drawable.ic_baseline_arrow_drop_up_24);
+                    editButton.show();
+                }
+            }
+
+            @Override
+            public void onSlide(@NonNull View bottomSheet, float slideOffset) { }
+        });
+
+        bottomSheetButton.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                if (behavior.getState() == BottomSheetBehavior.STATE_EXPANDED) {
+                    behavior.setState(BottomSheetBehavior.STATE_COLLAPSED);
+                } else {
+                    behavior.setState(BottomSheetBehavior.STATE_EXPANDED);
+                }
+            }
+        });
     }
 
     @Override
@@ -183,15 +235,37 @@ public class LoyaltyCardViewActivity extends AppCompatActivity
 
         if(loyaltyCard.note.length() > 0)
         {
+            noteView.setVisibility(View.VISIBLE);
             noteView.setText(loyaltyCard.note);
-            TextViewCompat.setAutoSizeTextTypeUniformWithConfiguration(noteView,
-                    getResources().getInteger(R.integer.settings_card_note_min_font_size_sp)-1,
-                    settings.getCardNoteFontSize(), 1, TypedValue.COMPLEX_UNIT_SP);
         }
         else
         {
             noteView.setVisibility(View.GONE);
-            noteViewDivider.setVisibility(View.GONE);
+        }
+
+        List<Group> loyaltyCardGroups = db.getLoyaltyCardGroups(loyaltyCardId);
+
+        if(loyaltyCardGroups.size() > 0) {
+            StringBuilder groupsString = new StringBuilder();
+            for (Group group : loyaltyCardGroups) {
+                groupsString.append(group._id);
+                groupsString.append(" ");
+            }
+
+            groupsView.setVisibility(View.VISIBLE);
+            groupsView.setText(getString(R.string.groupsList, groupsString.toString()));
+        }
+        else
+        {
+            groupsView.setVisibility(View.GONE);
+        }
+
+        if (noteView.getVisibility() == View.VISIBLE || groupsView.getVisibility() == View.VISIBLE) {
+            bottomSheet.setVisibility(View.VISIBLE);
+        }
+        else
+        {
+            bottomSheet.setVisibility(View.GONE);
         }
 
         storeName.setText(loyaltyCard.store);
@@ -272,20 +346,6 @@ public class LoyaltyCardViewActivity extends AppCompatActivity
         {
             findViewById(R.id.barcode).setVisibility(View.GONE);
         }
-
-        FloatingActionButton editButton = findViewById(R.id.fabEdit);
-        editButton.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                Intent intent = new Intent(getApplicationContext(), LoyaltyCardEditActivity.class);
-                Bundle bundle = new Bundle();
-                bundle.putInt("id", loyaltyCardId);
-                bundle.putBoolean("update", true);
-                intent.putExtras(bundle);
-                startActivity(intent);
-                finish();
-            }
-        });
     }
 
     @Override

app/src/main/java/protect/card_locker/preferences/Settings.java

@@ -81,11 +81,6 @@ public class Settings
         return getInt(R.string.settings_key_card_id_font_size, R.integer.settings_card_id_font_size_sp);
     }
 
-    public int getCardNoteFontSize()
-    {
-        return getInt(R.string.settings_key_card_note_font_size, R.integer.settings_card_note_font_size_sp);
-    }
-
     public boolean useMaxBrightnessDisplayingBarcode()
     {
         return getBoolean(R.string.settings_key_display_barcode_max_brightness, true);

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

@@ -55,6 +55,7 @@
                           android:labelFor="@+id/cardId"
                           android:text="@string/cardId" />
                 <EditText android:id="@+id/cardId"
+                          android:importantForAutofill="no"
                           android:layout_width="fill_parent"
                           android:layout_height="wrap_content"
                           android:inputType="text"/>
@@ -69,6 +70,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:text="@string/barcodeNoBarcode"
+                android:textColor="#FFFFFF"
                 android:enabled="false" />
             <LinearLayout android:orientation="vertical"
                           android:padding="10.0dp"

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

@@ -4,44 +4,26 @@
     android:orientation="vertical"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content">
-    <LinearLayout
+    <TextView
         android:id="@+id/add_from_camera"
-        android:orientation="horizontal"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:padding="@dimen/inputPadding">
-        <ImageView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:src="@drawable/ic_camera_white"
-            app:tint="@color/iconColor"
-            android:padding="@dimen/inputPadding" />
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="@string/addWithCamera"
-            android:padding="@dimen/inputPadding" />
-    </LinearLayout>
+        android:text="@string/addWithCamera"
+        android:padding="@dimen/inputPadding"
+        android:drawablePadding="@dimen/inputPadding"
+        app:drawableStartCompat="@drawable/ic_camera_white"
+        app:drawableTint="@color/iconColor" />
     <View
         android:layout_width="match_parent"
         android:layout_height="1dp"
         android:background="@android:color/darker_gray"/>
-    <LinearLayout
+    <TextView
         android:id="@+id/add_manually"
-        android:orientation="horizontal"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:padding="@dimen/inputPadding">
-        <ImageView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:src="@drawable/ic_mode_edit_white_24dp"
-            app:tint="@color/iconColor"
-            android:padding="@dimen/inputPadding" />
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="@string/addManually"
-            android:padding="@dimen/inputPadding" />
-    </LinearLayout>
+        android:text="@string/addManually"
+        android:padding="@dimen/inputPadding"
+        android:drawablePadding="@dimen/inputPadding"
+        app:drawableStartCompat="@drawable/ic_mode_edit_white_24dp"
+        app:drawableTint="@color/iconColor" />
 </LinearLayout>

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

@@ -12,8 +12,7 @@
     <LinearLayout
         android:orientation="vertical"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_weight="1">
+        android:layout_height="wrap_content">
 
         <TextView
             android:id="@+id/name"
@@ -36,8 +35,7 @@
     <LinearLayout
         android:orientation="horizontal"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_weight="1">
+        android:layout_height="wrap_content">
 
         <ImageButton
             android:id="@+id/moveUp"

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

@@ -49,7 +49,6 @@
                     android:layout_width="@dimen/cardThumbnailSize"
                     android:layout_height="@dimen/cardThumbnailSize"
                     android:layout_marginEnd="@dimen/activity_margin"
-                    android:layout_marginRight="@dimen/activity_margin"
                     android:layout_gravity="center_vertical"
                     app:cardCornerRadius="4dp"
                     android:paddingHorizontal="@dimen/inputPadding"
@@ -121,28 +120,19 @@
             </LinearLayout>
 
             <!-- Buttons -->
-            <TableLayout android:layout_width="fill_parent"
+            <LinearLayout android:orientation="horizontal"
+                android:padding="10.0dip"
+                android:layout_width="fill_parent"
                 android:layout_height="wrap_content"
-                android:shrinkColumns="1">
-
-                <LinearLayout android:orientation="vertical"
-                    android:layout_width="fill_parent"
-                    android:layout_height="wrap_content">
-
-                    <LinearLayout android:orientation="horizontal"
-                        android:padding="10.0dip"
-                        android:layout_width="fill_parent"
-                        android:layout_height="wrap_content"
-                        android:id="@+id/barcodeCaptureLayout">
-                        <Button android:id="@+id/enterButton"
-                            android:layout_margin="@dimen/inputMargin"
-                            android:layout_width="0dp"
-                            android:layout_height="wrap_content"
-                            android:text="@string/editCard"
-                            android:layout_weight="1.0"/>
-                    </LinearLayout>
-                </LinearLayout>
-            </TableLayout>
+                android:id="@+id/barcodeCaptureLayout">
+                <Button android:id="@+id/enterButton"
+                        android:layout_margin="@dimen/inputMargin"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:text="@string/editCard"
+                    android:textColor="#FFFFFF"
+                    android:layout_weight="1.0"/>
+            </LinearLayout>
 
             <!-- Card ID and Barcode type -->
             <LinearLayout
@@ -151,7 +141,8 @@
                 android:layout_height="wrap_content"
                 android:paddingHorizontal="@dimen/inputPadding"
                 android:paddingTop="@dimen/inputPadding"
-                android:orientation="horizontal">
+                android:orientation="horizontal"
+                android:baselineAligned="false">
 
                 <!-- Card ID -->
                 <com.google.android.material.textfield.TextInputLayout
@@ -177,7 +168,8 @@
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
                     android:layout_weight="1.0"
-                    android:hint="@string/barcodeType">
+                    android:hint="@string/barcodeType"
+                    android:labelFor="@+id/barcodeTypeField">
 
                     <AutoCompleteTextView
                         android:id="@+id/barcodeTypeField"

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

@@ -12,7 +12,6 @@
         android:layout_width="@dimen/cardThumbnailSize"
         android:layout_height="@dimen/cardThumbnailSize"
         android:layout_marginEnd="@dimen/activity_margin"
-        android:layout_marginRight="@dimen/activity_margin"
         app:cardCornerRadius="4dp"
         app:cardElevation="0dp">
 
@@ -32,23 +31,17 @@
         android:layout_weight="1">
 
         <LinearLayout
+            android:id="@+id/valueLayout"
             android:layout_width="wrap_content"
-            android:layout_height="wrap_content" >
+            android:layout_height="wrap_content"
+            android:visibility="visible" >
 
-            <LinearLayout
-                android:id="@+id/valueLayout"
+            <TextView
+                android:id="@+id/store"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:visibility="visible">
-
-                <TextView
-                    android:id="@+id/store"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:textSize="@dimen/storeNameTextSize"
-                    android:textStyle="bold"/>
-
-            </LinearLayout>
+                android:textSize="@dimen/storeNameTextSize"
+                android:textStyle="bold"/>
 
         </LinearLayout>
 
@@ -64,8 +57,8 @@
         android:id="@+id/star"
         android:layout_width="@dimen/cardThumbnailSize"
         android:layout_height="@dimen/cardThumbnailSize"
-        android:layout_marginLeft="@dimen/activity_margin"
+        android:layout_marginStart="@dimen/activity_margin"
         android:src="@drawable/ic_starred_white"
-        android:tint="#000000"
+        app:tint="@color/iconColor"
         android:contentDescription="@string/starImage"/>
 </LinearLayout>

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

@@ -59,44 +59,14 @@
                 android:layout_marginLeft="10.0dip"
                 android:layout_marginRight="10.0dip"
                 app:layout_constraintTop_toBottomOf="@+id/barcode"
-                app:layout_constraintBottom_toTopOf="@+id/noteViewDivider"
+                app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
                 android:textAlignment="center"
                 app:autoSizeTextType="uniform"
                 app:autoSizeMinTextSize="@dimen/singleCardCardIdTextSizeMin"
                 app:autoSizeMaxTextSize="@dimen/singleCardCardIdTextSizeMax"
-                android:ellipsize="end"
-                android:textIsSelectable="true"/>
-
-            <View
-                android:id="@id/noteViewDivider"
-                android:layout_width="match_parent"
-                android:layout_height="1dp"
-                android:background="@android:color/black"
-                app:layout_constraintTop_toBottomOf="@id/cardIdView"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintBottom_toBottomOf="@+id/noteView"
-                />
-
-            <TextView
-                android:id="@id/noteView"
-                android:layout_width="0dp"
-                android:layout_height="0dp"
-                android:layout_margin="10.0dip"
-                android:layout_gravity="bottom"
-                app:layout_constraintTop_toBottomOf="@id/noteViewDivider"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintLeft_toLeftOf="parent"
-                app:layout_constraintRight_toRightOf="parent"
-                app:autoSizeTextType="uniform"
-                app:autoSizeMinTextSize="@dimen/singleCardNoteTextSizeMin"
-                app:autoSizeMaxTextSize="@dimen/singleCardNoteTextSizeMax"
-                android:textIsSelectable="true"
-                android:scrollbars="vertical"/>
+                android:ellipsize="end"/>
 
         </androidx.constraintlayout.widget.ConstraintLayout>
 
@@ -107,6 +77,48 @@
             android:layout_gravity="top"/>
     </FrameLayout>
 
+    <LinearLayout
+        android:id="@+id/bottom_sheet"
+        android:visibility="gone"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical"
+        app:behavior_hideable="false"
+        app:behavior_peekHeight="80dp"
+        app:layout_behavior="com.google.android.material.bottomsheet.BottomSheetBehavior">
+
+        <ImageButton
+            android:id="@+id/bottomSheetButton"
+            android:layout_width="match_parent"
+            android:layout_height="80dp"
+            android:background="@color/colorPrimary"
+            android:gravity="center"
+            android:src="@drawable/ic_baseline_arrow_drop_up_24"
+            android:adjustViewBounds="true"
+            android:scaleType="fitCenter"
+            android:tint="@android:color/white" />
+
+        <TextView
+            android:id="@+id/noteView"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:gravity="center"
+            android:padding="20dp"
+            app:autoSizeTextType="uniform"
+            app:autoSizeMinTextSize="@dimen/singleCardNoteTextSizeMin"
+            app:autoSizeMaxTextSize="@dimen/singleCardNoteTextSizeMax" />
+
+        <TextView
+            android:id="@+id/groupsView"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:gravity="center"
+            android:padding="20dp"
+            app:autoSizeTextType="uniform"
+            app:autoSizeMinTextSize="@dimen/singleCardNoteTextSizeMin"
+            app:autoSizeMaxTextSize="@dimen/singleCardNoteTextSizeMax" />
+    </LinearLayout>
+
     <com.google.android.material.appbar.AppBarLayout
         android:id="@+id/app_bar_layout"
         android:background="@android:color/transparent"

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

@@ -10,7 +10,6 @@
     <string name="cancel">Zrušit</string>
     <string name="save">Uložit</string>
     <string name="capture">Naskenovat kartu</string>
-    <string name="enterCard">Vložit vlastnoručně</string>
     <string name="edit">Editovat</string>
     <string name="delete">Smazat</string>
     <string name="confirm">Potvrdit</string>
@@ -26,7 +25,6 @@
 
     <string name="noStoreError">Nebyl zadán Obchod</string>
     <string name="noCardIdError">Nebylo zadáno ID karty</string>
-    <string name="cardIdFormat">%1$s: %2$s</string>
     <string name="importExport">Import/Export</string>
     <string name="exportName">Export</string>
     <string name="importExportHelp">Zálohování dat vám umožní přesunout vaše uložené karty na jiné zařízení.</string>

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

@@ -12,7 +12,6 @@
     <string name="cancel">Abbrechen</string>
     <string name="save">Speichern</string>
     <string name="capture">Karte scannen</string>
-    <string name="enterCard">Manuell eingeben</string>
     <string name="editCard">Karte bearbeiten</string>
     <string name="edit">Bearbeiten</string>
     <string name="delete">Löschen</string>
@@ -35,7 +34,6 @@
     <string name="noStoreError">Kein Geschäft angegeben</string>
     <string name="noCardIdError">Keine Kartennummer angegeben</string>
     <string name="noCardExistsError">Karte konnte nicht gefunden werden</string>
-    <string name="cardIdFormat">%1$s: %2$s</string>
     <string name="importExport">Import/Export</string>
     <string name="exportName">Exportieren</string>
     <string name="importExportHelp">Durch das Sichern Ihrer Karten können Sie sie auf ein anderes Gerät verschieben.</string>
@@ -65,10 +63,6 @@
     <string name="copy_to_clipboard_toast">Nummer in die Zwischenablage kopiert</string>
     <string name="thumbnailDescription">Vorschaubild für die Karte</string>
     <string name="change">Anpassen</string>
-    <string name="storeTextColorTitle">Textfarbe</string>
-    <string name="storeTextBackgroundColorTitle">Hintergrundfarbe</string>
-    <string name="storeNameBackgroundColorDescription">Hintergrundfarbe für den Geschäftsnamen</string>
-    <string name="storeNameColorDescription">Farbe für den Geschäftsnamen</string>
     <string name="settings">Einstellungen</string>
     <string name="settings_category_title_ui">Benutzeroberfläche</string>
     <string name="settings_card_title_list_font_size">Schriftgröße des Kartentitels (Listenmodus)</string>
@@ -89,7 +83,6 @@
     <string name="app_copyright_old">Basiert auf Loyalty Card Keychain, Copyright 2016–2020 Branden Archer.</string>
     <string name="exportOptionExplanation">Die Daten werden an einen Ort Ihrer Wahl geschrieben.</string>
     <string name="failedParsingImportUriError">Der Import-URI konnte nicht analysiert werden</string>
-    <string name="addedShortcut">Verknüpfung hinzugefügt</string>
     <string name="share">Teilen</string>
     <string name="barcodeNoBarcode">Diese Karte hat keinen Strichcode</string>
     <string name="barcodeType">Strichcode-Typ</string>
@@ -105,4 +98,12 @@
     <string name="leaveWithoutSaveTitle">Beenden ohne zu speichern</string>
     <string name="failedOpeningFileManager">Fehler beim Öffnen eines Dateiverwaltungsprogrammes. Stellen Sie sicher, dass eine installiert ist.</string>
     <string name="noBarcode">Kein Strichcode</string>
-</resources>
+    <string name="addManually">Die Karten-ID manuell eingeben</string>
+    <string name="addWithCamera">Scannen Sie den Strichcode mit Ihrer Kamera</string>
+    <string name="moveDown">In der Liste nach unten verschieben</string>
+    <string name="moveUp">In der Liste nach oben verschieben</string>
+    <plurals name="groupCardCount">
+        <item quantity="one"><xliff:g xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">%d</xliff:g> Karte</item>
+        <item quantity="other"><xliff:g xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">%d</xliff:g> Karten</item>
+    </plurals>
+</resources>

app/src/main/res/values-el-rGR/strings.xml

@@ -10,7 +10,6 @@
     <string name="cancel">Άκυρο</string>
     <string name="save">Αποθήκευση</string>
     <string name="capture">Φωτογράφιση Κάρτας</string>
-    <string name="enterCard">Εισάγετε Κάρτα</string>
     <string name="editCard">Επεξεργασία Κάρτας</string>
     <string name="edit">Επεξεργασία</string>
     <string name="delete">Διαγραφή</string>
@@ -33,7 +32,6 @@
     <string name="noStoreError">Δεν δώσατε κατάστημα</string>
     <string name="noCardIdError">Δεν δώσατε κωδικό κάρτας</string>
     <string name="noCardExistsError">Δεν ήταν δυνατό να εντοπιστεί κάρτα</string>
-    <string name="cardIdFormat">%1$s: %2$s</string>
     <string name="importExport">Εισαγωγή/Εξαγωγή</string>
     <string name="exportName">Εξαγωγή</string>
     <string name="importExportHelp">Τα εφεδρικά δεδομένα σας δίνουν την δυνατότητα να μεταφέρετε τις κάρτες σας σε μία άλλη συσκευή.</string>
@@ -67,10 +65,6 @@
     <string name="thumbnailDescription">Μικρογραφία κάρτας</string>
 
     <string name="change">Αλλαγή</string>
-    <string name="storeTextColorTitle">Χρώμα Κειμένου Καταστήματος</string>
-    <string name="storeTextBackgroundColorTitle">Χρώμα Κεφαλίδας</string>
-    <string name="storeNameBackgroundColorDescription">Χρώμα για το υπόβαθρο του καταστήματος</string>
-    <string name="storeNameColorDescription">Χρώμα για το κείμενο του καταστήματος</string>
 
     <string name="settings">Ρυθμίσεις</string>
     <string name="settings_category_title_ui">Διεπαφή χρήστη</string>

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

@@ -10,7 +10,6 @@
     <string name="cancel">Cancelar</string>
     <string name="save">Guardar</string>
     <string name="capture">Capturar tarjeta</string>
-    <string name="enterCard">Introducir tarjeta</string>
     <string name="editCard">Editar tarjeta</string>
     <string name="edit">Editar</string>
     <string name="delete">Eliminar</string>
@@ -31,7 +30,6 @@
     <string name="noStoreError">Establecimiento no especificado</string>
     <string name="noCardIdError">Id. de tarjeta no especificado</string>
     <string name="noCardExistsError">No se ha podido encontrar la tarjeta de fidelización</string>
-    <string name="cardIdFormat">%1$s: %2$s</string>
     <string name="importExport">Importar/exportar</string>
     <string name="exportName">Exportar</string>
     <string name="importExportHelp">La copia de respaldo le permite transferir sus tarjetas a otro dispositivo.</string>
@@ -55,10 +53,6 @@
     <string name="about_title_fmt">Acerca de <xliff:g id="app_name">%s</xliff:g></string>
     <string name="debug_version_fmt">Versión: <xliff:g id="version">%s</xliff:g></string>
     <string name="change">Cambiar</string>
-    <string name="storeTextColorTitle">Color de texto de establecimiento</string>
-    <string name="storeTextBackgroundColorTitle">Color principal</string>
-    <string name="storeNameBackgroundColorDescription">Color de fondo para el texto de la tienda</string>
-    <string name="storeNameColorDescription">Color del texto de la tienda</string>
     <string name="settings">Configuración</string>
     <string name="settings_category_title_ui">Interfaz de usuario</string>
     <string name="settings_card_title_list_font_size">Tamaño de la letra para el título (lista)</string>
@@ -79,7 +73,6 @@
     <string name="app_copyright_old">Basado en Loyalty Card Keychain, derechos de autor 2016–2020 de Branden Archer.</string>
     <string name="exportOptionExplanation">Los datos se guardarán en la ubicación que elija.</string>
     <string name="failedParsingImportUriError">No se pudo procesar el URI de importación</string>
-    <string name="addedShortcut">Atajo añadido</string>
     <string name="share">Compartir</string>
     <string name="barcodeNoBarcode">Esta tarjeta no tiene código de barras</string>
     <string name="barcodeType">Tipo de código de barras</string>

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

@@ -4,13 +4,12 @@
     <string name="noGiftCards">Appuyez d\'abord sur le bouton \"+\" (plus) pour ajouter une carte.
 \n
 \nCatima enregistre vos cartes sur votre appareil, pour toujours les avoir à portée de main.</string>
-    <string name="storeName">Nom</string>
-    <string name="note">Note</string>
+    <string name="storeName">Nom du Magasin</string>
+    <string name="note">Notes</string>
     <string name="cardId">Numéro</string>
     <string name="cancel">Annuler</string>
     <string name="save">Enregistrer</string>
     <string name="capture">Mode capture</string>
-    <string name="enterCard">Mode manuel</string>
     <string name="editCard">Modifier</string>
     <string name="edit">Modifier</string>
     <string name="delete">Supprimer</string>
@@ -31,7 +30,6 @@
     <string name="noStoreError">Aucun nom de magasin saisi</string>
     <string name="noCardIdError">Aucun numéro de carte saisi</string>
     <string name="noCardExistsError">Aucune carte trouvée</string>
-    <string name="cardIdFormat">%1$s: %2$s</string>
     <string name="importExport">Importer/Exporter</string>
     <string name="exportName">Exporter</string>
     <string name="importExportHelp">Exporter vos cartes vous permet de les récupérer sur un autre appareil.</string>
@@ -56,15 +54,11 @@
     <string name="debug_version_fmt">Version : <xliff:g id="version">%s</xliff:g></string>
     <string name="app_revision_fmt">Notes de version : <xliff:g xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2" id="app_revision_url">%s</xliff:g></string>
     <string name="app_libraries"><xliff:g id="app_name">%s</xliff:g> utilise les bibliothèques-tierces suivantes : <xliff:g id="app_libraries_list">%s</xliff:g></string>
-    <string name="app_resources"><xliff:g id="app_name">%s</xliff:g> utilise les ressources-tierces suivantes : <xliff:g id="app_resources_list">%s</xliff:g></string>
+    <string name="app_resources"><xliff:g xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2" id="app_name">%s</xliff:g> utilise les ressources tierces suivantes : <xliff:g xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2" id="app_resources_list">%s</xliff:g></string>
     <string name="selectBarcodeTitle">Choisissez le code-barres</string>
     <string name="copy_to_clipboard_toast">Numéro de carte copié dans le presse-papier</string>
-    <string name="thumbnailDescription">Miniature pour la carte</string>
+    <string name="thumbnailDescription">Miniature de la carte</string>
     <string name="change">Modifier</string>
-    <string name="storeTextColorTitle">Couleur du texte du magasin</string>
-    <string name="storeTextBackgroundColorTitle">Couleur du titre</string>
-    <string name="storeNameBackgroundColorDescription">Couleur de fond du texte du magasin</string>
-    <string name="storeNameColorDescription">Couleur pour le nom du magasin</string>
     <string name="settings">Paramètres</string>
     <string name="settings_category_title_ui">Interface utilisateur</string>
     <string name="settings_card_title_list_font_size">Taille du nom des cartes (mode liste)</string>
@@ -85,7 +79,6 @@
     <string name="app_copyright_old">Basé sur Loyalty Card Keychain, copyright 2016–2020 Branden Archer.</string>
     <string name="exportOptionExplanation">Les données seront eportées vers l\'emplacement de votre choix.</string>
     <string name="failedParsingImportUriError">Impossible d\'analyser l\'URI d\'importation</string>
-    <string name="addedShortcut">Raccourci ajouté</string>
     <string name="share">Partager</string>
     <string name="barcodeNoBarcode">Cette carte n\'a pas de code-barres</string>
     <string name="barcodeType">Type de code-barres</string>
@@ -102,7 +95,7 @@
     <string name="groups">Groupes</string>
     <string name="enter_group_name">Entrez le nom du groupe</string>
     <string name="noBarcode">Aucun code-barres</string>
-    <string name="leaveWithoutSaveConfirmation">Voulez-vous quitter la page \? Toutes vos modifications seront perdues.</string>
+    <string name="leaveWithoutSaveConfirmation">Voulez-vous quitter la page \? Toutes vos modifications seront perdues.</string>
     <string name="leaveWithoutSaveTitle">Quitter sans enregistrer</string>
     <string name="failedOpeningFileManager">Gestionnaire de fichiers introuvable. Installez-en un si nécessaire.</string>
     <string name="addManually">Entrer manuellement l\'identifiant de la carte</string>
@@ -110,7 +103,7 @@
     <string name="moveDown">Descendre dans la liste</string>
     <string name="moveUp">Monter dans la liste</string>
     <plurals name="groupCardCount">
-        <item quantity="one">&lt;xliff:g xmlns:xliff=\"urn:oasis:names:tc:xliff:document:1.2\"&gt;%d&lt;/xliff:g&gt; carte</item>
-        <item quantity="other">&lt;xliff:g xmlns:xliff=\"urn:oasis:names:tc:xliff:document:1.2\"&gt;%d&lt;/xliff:g&gt; cartes</item>
+        <item quantity="one"><xliff:g xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">%d</xliff:g> carte</item>
+        <item quantity="other"><xliff:g xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">%d</xliff:g> cartes</item>
     </plurals>
 </resources>

app/src/main/res/values-he-rIL/strings.xml

@@ -7,6 +7,5 @@
     <string name="cancel">ביטול</string>
     <string name="save">שמור</string>
     <string name="capture">צלם כרטיס</string>
-    <string name="enterCard">הכנס כרטיס</string>
     <string name="editCard">עריכת כרטיס</string>
     </resources>

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

@@ -11,7 +11,6 @@
     <string name="cancel">Annulla</string>
     <string name="save">Salva</string>
     <string name="capture">Scansione carta</string>
-    <string name="enterCard">Inserisci carta</string>
     <string name="editCard">Modifica carta</string>
     <string name="edit">Modifica</string>
     <string name="delete">Elimina</string>
@@ -34,7 +33,6 @@
     <string name="noCardIdError">Nessun codice carta inserito</string>
     <string name="noCardExistsError">Impossibile trovare la carta</string>
     <string name="failedParsingImportUriError">Impossibile analizzare l\'URI</string>
-    <string name="cardIdFormat">%1$s: %2$s</string>
     <string name="importExport">Importa/Esporta</string>
     <string name="exportName">Esporta</string>
     <string name="importExportHelp">Fare il backup dei dati ti permette di spostare le tue carte da un dispositivo ad un altro.</string>
@@ -65,10 +63,6 @@
     <string name="copy_to_clipboard_toast">ID della carta copiato negli appunti</string>
     <string name="thumbnailDescription">Miniatura carta</string>
     <string name="change">Cambia</string>
-    <string name="storeTextColorTitle">Colore titolo</string>
-    <string name="storeTextBackgroundColorTitle">Colore scheda</string>
-    <string name="storeNameBackgroundColorDescription">Colore di sfondo del titolo carta</string>
-    <string name="storeNameColorDescription">Colore del titolo carta</string>
     <string name="settings">Impostazioni</string>
     <string name="settings_category_title_ui">Interfaccia utente</string>
     <string name="settings_theme">Tema</string>
@@ -87,7 +81,6 @@
     <string name="importSuccessful">Dati della carta fedeltà importati correttamente</string>
     <string name="app_copyright_old">Basato su Loyalty Card Keychain, copyright 2016–2020 Branden Archer.</string>
     <string name="exportOptionExplanation">I dati verranno scritti in una posizione a tua scelta.</string>
-    <string name="addedShortcut">Scorciatoia aggiunta</string>
     <string name="barcodeType">Tipo di codice a barre</string>
     <string name="unstar">Rimuovi dai preferiti</string>
     <string name="star">Aggiungi ai preferiti</string>

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

@@ -10,7 +10,6 @@
     <string name="cancel">Atšaukti</string>
     <string name="save">Išsaugoti</string>
     <string name="capture">Nufotografuoti kortelę</string>
-    <string name="enterCard">Įvesti kortelę</string>
     <string name="edit">Redaguoti</string>
     <string name="delete">Ištrinti</string>
     <string name="confirm">Patvirtinti</string>
@@ -25,7 +24,6 @@
 
     <string name="noStoreError">Parduotuvė neįvesta</string>
     <string name="noCardIdError">Neįvestas kortelės ID</string>
-    <string name="cardIdFormat">%1$s: %2$s</string>
     <string name="importExport">Importuoti/Exportuoti</string>
     <string name="exportName">Exportuoti</string>
     <string name="importFailed">Nepavyko importuoti</string>

app/src/main/res/values-nb-rNO/strings.xml

@@ -11,7 +11,6 @@
     <string name="cancel">Avbryt</string>
     <string name="save">Lagre</string>
     <string name="capture">Les inn kort</string>
-    <string name="enterCard">Skriv inn kort</string>
     <string name="editCard">Rediger kort</string>
     <string name="edit">Rediger</string>
     <string name="delete">Slett</string>
@@ -23,7 +22,6 @@
     <string name="ok">OK</string>
     <string name="copy_to_clipboard">Kopier ID til utklippstavle</string>
     <string name="sendLabel">Send…</string>
-    <string name="addedShortcut">Lagt til på hjemmeskjerm</string>
     <string name="editCardTitle">Rediger kundekort</string>
     <string name="addCardTitle">Legg til kundekort</string>
     <string name="scanCardBarcode">Skann kortets strekkode</string>
@@ -33,7 +31,6 @@
     <string name="noStoreError">Ingen butikk angitt</string>
     <string name="noCardIdError">Ingen kort-ID innskrevet</string>
     <string name="noCardExistsError">Kunne ikke finne kort</string>
-    <string name="cardIdFormat">%1$s: %2$s</string>
     <string name="importExport">Import/eksport</string>
     <string name="exportName">Eksporter</string>
     <string name="importExportHelp">Sikkerhetskopiering av kort lar deg flytte dem til en annen enhet.</string>
@@ -65,10 +62,6 @@
     <string name="copy_to_clipboard_toast">Kort-ID kopiert til utklippstavle</string>
     <string name="thumbnailDescription">Miniatyrbilde for kort</string>
     <string name="change">Endre</string>
-    <string name="storeTextColorTitle">Skriftstørrelse for butikktekst</string>
-    <string name="storeTextBackgroundColorTitle">Overskriftsfarge</string>
-    <string name="storeNameBackgroundColorDescription">Farge for butikktekstbakgrunn</string>
-    <string name="storeNameColorDescription">Butikktekstfarge</string>
     <string name="settings">Innstillinger</string>
     <string name="settings_category_title_ui">Brukergrensesnitt</string>
     <string name="settings_card_title_list_font_size">Korttittelskriftstørrelse</string>

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

@@ -14,7 +14,6 @@
     <string name="cancel">Annuleren</string>
     <string name="save">Opslaan</string>
     <string name="capture">Scan een kaart</string>
-    <string name="enterCard">Voer een kaartnummer in</string>
     <string name="editCard">Kaart bewerken</string>
     <string name="edit">Bewerken</string>
     <string name="delete">Verwijderen</string>
@@ -27,7 +26,6 @@
     <string name="copy_to_clipboard">Kaartnummer kopiëren naar klembord</string>
     <string name="share">Delen</string>
     <string name="sendLabel">Versturen…</string>
-    <string name="addedShortcut">Snelkoppeling is toegevoegd</string>
     <string name="editCardTitle">Kaart bewerken</string>
     <string name="addCardTitle">Kaart toevoegen</string>
     <string name="scanCardBarcode">Scan de barcode van de kaart</string>
@@ -38,7 +36,6 @@
     <string name="noCardIdError">Geen kaartnummer ingevoerd</string>
     <string name="noCardExistsError">De kaart is niet aangetroffen</string>
     <string name="failedParsingImportUriError">Kan de import-uri niet verwerken</string>
-    <string name="cardIdFormat">%1$s: %2$s</string>
     <string name="importExport">Importeren/Exporteren</string>
     <string name="exportName">Exporteren</string>
     <string name="importExportHelp">Door je kaarten te back-uppen, kun je ze overzetten naar een ander apparaat.</string>
@@ -70,10 +67,6 @@
     <string name="copy_to_clipboard_toast">Kaartnummer is gekopieerd naar het klembord</string>
     <string name="thumbnailDescription">Miniatuurvoorbeeld van kaart</string>
     <string name="change">Aanpassen</string>
-    <string name="storeTextColorTitle">Tekstkleur van winkelnaam</string>
-    <string name="storeTextBackgroundColorTitle">Kopkleur</string>
-    <string name="storeNameBackgroundColorDescription">Achtergrondkleur van winkeltekst</string>
-    <string name="storeNameColorDescription">Kleur van winkeltekst</string>
     <string name="settings">Instellingen</string>
     <string name="settings_category_title_ui">Vormgeving</string>
     <string name="settings_theme">Thema</string>
@@ -110,7 +103,8 @@
     <string name="failedOpeningFileManager">Kan de bestandsbeheerder niet openen - zorg dat je er een hebt geïnstalleerd.</string>
     <string name="noBarcode">Geen barcode</string>
     <plurals name="groupCardCount">
-        <item quantity="one">&lt;xliff:g xmlns:xliff=\"urn:oasis:names:tc:xliff:document:1.2\"&gt;%d&lt;/xliff:g&gt; kaart</item>
-        <item quantity="other">&lt;xliff:g xmlns:xliff=\"urn:oasis:names:tc:xliff:document:1.2\"&gt;%d&lt;/xliff:g&gt; kaarten</item>
+        <item quantity="one"><xliff:g xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">%d</xliff:g> kaart</item>
+        <item quantity="other"><xliff:g xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">%d</xliff:g> kaarten</item>
     </plurals>
+    <string name="groupsList">Groepen: <xliff:g xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">%s</xliff:g></string>
 </resources>

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

@@ -11,7 +11,6 @@
     <string name="cancel">Anuluj</string>
     <string name="save">Zapisz</string>
     <string name="capture">Zeskanuj kod</string>
-    <string name="enterCard">Wprowadź ręcznie</string>
     <string name="editCard">Edytuj kartę</string>
     <string name="edit">Edytuj</string>
     <string name="delete">Usuń</string>
@@ -34,7 +33,6 @@
     <string name="noCardIdError">Nie wprowadzono identyfikatora karty</string>
     <string name="noCardExistsError">Nie można wyszukać karty lojalnościowej</string>
     <string name="failedParsingImportUriError">Nie można przeanalizować identyfikatora importu URI</string>
-    <string name="cardIdFormat">%1$s: %2$s</string>
     <string name="importExport">Importuj/Eksportuj</string>
     <string name="exportName">Eksportuj</string>
     <string name="importExportHelp">Zarchiwizowane dane umożliwiają przeniesienie kart na inne urządzenie.</string>
@@ -65,10 +63,6 @@
     <string name="copy_to_clipboard_toast">Skopiowano identyfikator karty do schowka</string>
     <string name="thumbnailDescription">Miniaturka karty</string>
     <string name="change">Zmień</string>
-    <string name="storeTextColorTitle">Kolor tekstu nazwy sklepu</string>
-    <string name="storeTextBackgroundColorTitle">Kolor nagłówka</string>
-    <string name="storeNameBackgroundColorDescription">Kolor tła tekstu nazwy sklepu</string>
-    <string name="storeNameColorDescription">Kolor dla tekstu sklepu</string>
     <string name="settings">Ustawienia</string>
     <string name="settings_category_title_ui">Interfejs użytkownika</string>
     <string name="settings_theme">Motyw</string>
@@ -95,7 +89,6 @@
     <string name="starImage">Ulubiona gwiazda</string>
     <string name="app_copyright_old">Na podstawie Loyalty Card Keychain, prawa autorskie 2016–2020 Branden Archer.</string>
     <string name="exportOptionExplanation">Dane zostaną zapisane w wybranym przez Ciebie miejscu.</string>
-    <string name="addedShortcut">Dodano skrót</string>
     <string name="unstar">Usuń z ulubionych</string>
     <string name="star">Dodaj do ulubionych</string>
     <string name="noBarcode">Brak kodu kreskowego</string>

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

@@ -14,7 +14,6 @@
     <string name="cancel">Отменить</string>
     <string name="save">Сохранить</string>
     <string name="capture">Сканировать карту</string>
-    <string name="enterCard">Ввести номер</string>
     <string name="editCard">Редактировать штрих-код</string>
     <string name="edit">Редактировать</string>
     <string name="delete">Удалить карту</string>
@@ -27,7 +26,6 @@
     <string name="copy_to_clipboard">Скопировать номер карты в буфер обмена</string>
     <string name="share">Переслать</string>
     <string name="sendLabel">Отправить…</string>
-    <string name="addedShortcut">Добавленный ярлык</string>
     <string name="editCardTitle">Редактировать карту</string>
     <string name="addCardTitle">Добавить карту</string>
     <string name="scanCardBarcode">Отсканируйте штрих-код</string>
@@ -38,7 +36,6 @@
     <string name="noCardIdError">Номер карты не указан</string>
     <string name="noCardExistsError">Карта не найдена</string>
     <string name="failedParsingImportUriError">Не удалось разобрать импортируемый URI</string>
-    <string name="cardIdFormat">%1$s: %2$s</string>
     <string name="importExport">Импорт/Экспорт</string>
     <string name="exportName">Экспорт</string>
     <string name="importExportHelp">Резервное копирование карт позволяет переместить их на другое устройство.</string>
@@ -70,10 +67,6 @@
     <string name="copy_to_clipboard_toast">Номер карты скопирован в буфер обмена</string>
     <string name="thumbnailDescription">Логотип карты</string>
     <string name="change">Изменить</string>
-    <string name="storeTextColorTitle">Цвет текста</string>
-    <string name="storeTextBackgroundColorTitle">Цвет фона</string>
-    <string name="storeNameBackgroundColorDescription">Цвет фона названия магазина</string>
-    <string name="storeNameColorDescription">Цвет текста названия магазина</string>
     <string name="settings">Настройки</string>
     <string name="settings_category_title_ui">Внешний вид</string>
     <string name="settings_theme">Тема</string>

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

@@ -10,7 +10,6 @@
     <string name="cancel">Zrušiť</string>
     <string name="save">Uložiť</string>
     <string name="capture">Zosnímať kartu</string>
-    <string name="enterCard">Zadať kód</string>
     <string name="editCard">Úprava karty</string>
     <string name="edit">Upraviť</string>
     <string name="delete">Vymazať</string>
@@ -33,7 +32,6 @@
     <string name="noStoreError">Nebol zadaný obchod</string>
     <string name="noCardIdError">Nebolo zadané ID karty</string>
     <string name="noCardExistsError">Nie je možné vyhľadať vernostnú kartu</string>
-    <string name="cardIdFormat">%1$s: %2$s</string>
     <string name="importExport">Import/Export</string>
     <string name="exportName">Export</string>
     <string name="importExportHelp">Zálohovanie dát Vám umožní presunúť Vaše uložené karty na iné zariadenie.</string>
@@ -67,10 +65,6 @@
     <string name="thumbnailDescription">Náhľad karty</string>
 
     <string name="change">Upraviť</string>
-    <string name="storeTextColorTitle">Farba textu</string>
-    <string name="storeTextBackgroundColorTitle">Farba hlavičky</string>
-    <string name="storeNameBackgroundColorDescription">Farba hlavičky</string>
-    <string name="storeNameColorDescription">Farba textu</string>
 
     <string name="settings">Nastavenia</string>
     <string name="settings_category_title_ui">Používateľské prostredie</string>

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

@@ -10,7 +10,6 @@
     <string name="cancel">Prekliči</string>
     <string name="save">Shrani</string>
     <string name="capture">Slikaj kartico</string>
-    <string name="enterCard">Vnesi kartico</string>
     <string name="editCard">Uredi kartico</string>
     <string name="edit">Uredi</string>
     <string name="delete">Izbriši</string>
@@ -33,7 +32,6 @@
     <string name="noStoreError">Ime trgovine ni bilo vnešeno</string>
     <string name="noCardIdError">Številka kartice ni bila vnešena</string>
     <string name="noCardExistsError">Te kartice zvestobe ni bilo moč najti</string>
-    <string name="cardIdFormat">%1$s:%2$s</string>
     <string name="importExport">Uvozi/izvozi</string>
     <string name="exportName">Izvozi</string>
     <string name="importExportHelp">Varnostna kopija omogoča varen prenos kartic na druge telefonske naprave.</string>
@@ -67,10 +65,6 @@
     <string name="thumbnailDescription">Ikona kartice</string>
 
     <string name="change">Spremeni</string>
-    <string name="storeTextColorTitle">Barva besedila trgovine</string>
-    <string name="storeTextBackgroundColorTitle">Barva naslova</string>
-    <string name="storeNameBackgroundColorDescription">Barva ozadja za imenom trgovine</string>
-    <string name="storeNameColorDescription">Barva trgovine</string>
 
     <string name="settings">Nastavitve</string>
     <string name="settings_category_title_ui">Uporabniški vmesnik</string>

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

@@ -28,7 +28,6 @@
     <integer name="settings_card_note_list_font_size_sp">14</integer>
     <integer name="settings_card_title_font_size_sp">40</integer>
     <integer name="settings_card_id_font_size_sp">50</integer>
-    <integer name="settings_card_note_font_size_sp">50</integer>
 
     <!-- Constraints -->
     <integer name="settings_card_title_list_max_font_size_sp">40</integer>
@@ -39,6 +38,4 @@
     <integer name="settings_card_title_min_font_size_sp">16</integer>
     <integer name="settings_card_id_max_font_size_sp">50</integer>
     <integer name="settings_card_id_min_font_size_sp">16</integer>
-    <integer name="settings_card_note_max_font_size_sp">50</integer>
-    <integer name="settings_card_note_min_font_size_sp">26</integer>
 </resources>

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

@@ -1,5 +1,6 @@
 <resources
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"
+    xmlns:tools="http://schemas.android.com/tools">
 
     <string name="app_name" translatable="false">Catima</string>
     <string name="action_search">Search</string>
@@ -21,7 +22,6 @@
     <string name="cancel">Cancel</string>
     <string name="save">Save</string>
     <string name="capture">Capture Card</string>
-    <string name="enterCard">Enter Card</string>
     <string name="editCard">Edit Card</string>
     <string name="edit">Edit</string>
     <string name="delete">Delete</string>
@@ -34,7 +34,6 @@
     <string name="copy_to_clipboard">Copy ID to clipboard</string>
     <string name="share">Share</string>
     <string name="sendLabel">Send&#8230;</string>
-    <string name="addedShortcut">Added shortcut</string>
     <string name="editCardTitle">Edit Card</string>
     <string name="addCardTitle">Add Card</string>
     <string name="scanCardBarcode">Scan Card Barcode</string>
@@ -47,7 +46,6 @@
     <string name="noCardIdError">No card ID entered</string>
     <string name="noCardExistsError">Could not find card</string>
     <string name="failedParsingImportUriError">Could not parse the import URI</string>
-    <string name="cardIdFormat">%1$s: %2$s</string>
     <string name="importExport">Import/Export</string>
     <string name="exportName">Export</string>
     <string name="importExportHelp">Backing up your cards allows you to move them to another device.</string>
@@ -69,7 +67,7 @@
     <string name="importOptionApplicationButton">Use external app</string>
 
     <string name="about">About</string>
-    <string name="app_copyright_fmt" translatable="false">Copyright 2019–<xliff:g>%d</xliff:g> Sylvia van Os.</string>
+    <string name="app_copyright_fmt" translatable="false" tools:ignore="PluralsCandidate">Copyright 2019–<xliff:g>%d</xliff:g> Sylvia van Os.</string>
     <string name="app_copyright_old">Based on Loyalty Card Keychain, copyright 2016–2020 Branden Archer.</string>
     <string name="app_license">Copylefted libre software, licensed GPLv3+.</string>
     <string name="about_title_fmt">About <xliff:g id="app_name">%s</xliff:g></string>
@@ -87,10 +85,6 @@
     <string name="starImage">Favorite star</string>
 
     <string name="change">Change</string>
-    <string name="storeTextColorTitle">Store Text Color</string>
-    <string name="storeTextBackgroundColorTitle">Heading Color</string>
-    <string name="storeNameBackgroundColorDescription">Color for store text background</string>
-    <string name="storeNameColorDescription">Color for store text</string>
 
     <string name="settings">Settings</string>
     <string name="settings_category_title_ui">User interface</string>
@@ -144,4 +138,5 @@
     <string name="leaveWithoutSaveConfirmation">Are you sure you want to leave this screen? Changed made will not be saved.</string>
     <string name="addWithCamera">Scan the barcode with your camera</string>
     <string name="addManually">Manually enter card ID</string>
+    <string name="groupsList">Groups: <xliff:g>%s</xliff:g></string>
 </resources>

app/src/main/res/xml/preferences.xml

@@ -41,13 +41,6 @@
             app:vnt_maxValue="@integer/settings_card_id_max_font_size_sp"
             app:vnt_minValue="@integer/settings_card_id_min_font_size_sp" />
 
-        <com.vanniktech.vntnumberpickerpreference.VNTNumberPickerPreference
-            android:key="@string/settings_key_card_note_font_size"
-            android:title="@string/settings_card_note_font_size"
-            android:defaultValue="@integer/settings_card_note_font_size_sp"
-            app:vnt_maxValue="@integer/settings_card_note_max_font_size_sp"
-            app:vnt_minValue="@integer/settings_card_note_min_font_size_sp" />
-
         <CheckBoxPreference
             android:defaultValue="true"
             android:key="@string/settings_key_display_barcode_max_brightness"

app/src/test/java/protect/card_locker/LoyaltyCardViewActivityTest.java

@@ -245,7 +245,6 @@ public class LoyaltyCardViewActivityTest
 
             checkFieldProperties(activity, R.id.storeNameEdit, editVisibility, store);
             checkFieldProperties(activity, R.id.noteEdit, editVisibility, note);
-            checkFieldProperties(activity, R.id.cardAndBarcodeLayout, cardId.isEmpty() ? View.GONE : View.VISIBLE, null);
             checkFieldProperties(activity, R.id.cardIdView, View.VISIBLE, cardId);
             checkFieldProperties(activity, R.id.barcodeTypeField, View.VISIBLE, barcodeType);
             checkFieldProperties(activity, R.id.barcode, View.VISIBLE, null);
@@ -263,7 +262,6 @@ public class LoyaltyCardViewActivityTest
         Activity activity = (Activity)activityController.get();
 
         checkAllFields(activity, ViewMode.ADD_CARD, "", "", "", "");
-        assertEquals(View.GONE, activity.findViewById(R.id.cardAndBarcodeLayout).getVisibility());
     }
 
     @Test
@@ -648,13 +646,11 @@ public class LoyaltyCardViewActivityTest
 
         final int STORE_FONT_SIZE = 50;
         final int CARD_FONT_SIZE = 40;
-        final int NOTE_FONT_SIZE = 30;
 
         SharedPreferences settings = PreferenceManager.getDefaultSharedPreferences(activity);
         settings.edit()
             .putInt(activity.getResources().getString(R.string.settings_key_card_title_font_size), STORE_FONT_SIZE)
             .putInt(activity.getResources().getString(R.string.settings_key_card_id_font_size), CARD_FONT_SIZE)
-            .putInt(activity.getResources().getString(R.string.settings_key_card_note_font_size), NOTE_FONT_SIZE)
             .apply();
 
         activityController.start();
@@ -665,13 +661,11 @@ public class LoyaltyCardViewActivityTest
 
         TextView storeName = activity.findViewById(R.id.storeName);
         TextView cardIdFieldView = activity.findViewById(R.id.cardIdView);
-        TextView noteView = activity.findViewById(R.id.noteView);
 
         TextViewCompat.getAutoSizeMaxTextSize(storeName);
         TextViewCompat.getAutoSizeMaxTextSize(storeName);
         assertEquals(STORE_FONT_SIZE, (int)storeName.getTextSize());
         assertEquals(CARD_FONT_SIZE, TextViewCompat.getAutoSizeMaxTextSize(cardIdFieldView));
-        assertEquals(NOTE_FONT_SIZE, TextViewCompat.getAutoSizeMaxTextSize(noteView));
 
         shadowOf(activity).clickMenuItem(android.R.id.home);
         assertEquals(true, activity.isFinishing());

fastlane/metadata/android/fr-FR/title.txt

@@ -1 +1 @@
-Catima
+Catima – Cartes de fidélité