Merge branch 'master' of github.com:TheLastProject/loyalty-card-locker

Update Fastlane changelogs

.github/workflows/autoclose-needs-info.yml

@@ -17,7 +17,8 @@ jobs:
           days-before-close: 90
           close-issue-message: 'This issue is missing necessary information and cannot be worked on in its current state. It has therefore been closed to keep the issue tracker clean. If you have more information, feel free to reopen it.'
           close-pr-message: 'This PR is missing necessary information and cannot be merged in its current state. It has therefore been closed to keep the issue tracker clean. If you have more information, feel free to reopen it.'
-          only-labels: 'needs info'
-          stale-issue-label: 'needs info'
-          stale-pr-label: 'needs info'
+          only-labels: 'state: needs info'
+          stale-issue-label: 'state: needs info'
+          stale-pr-label: 'state: needs info'
           remove-stale-when-updated: false
+          enable-statistics: true

CHANGELOG.md

@@ -1,5 +1,30 @@
 # Changelog
 
+## v2.15.2 - 103 (2022-02-11)
+
+- Fix manual language selection not applying everywhere
+- Fix crash in edit view on regionless locale
+
+## v2.15.1 - 102 (2022-02-10)
+
+- Various minor fixes
+- Fix crash when using Norwegian translation
+
+## v2.15.0 - 101 (2022-02-06)
+
+- Fix cropper not using theme colour
+- Fix minor theming issues
+- Add pure black dark theme for OLED screens
+
+## v2.14.1 - 100 (2022-01-15)
+
+- Hide search, expand and sort icons until there is at least 1 card
+- Various theming fixes
+
+## v2.14.0 - 99 (2022-01-14)
+
+- Material You redesign
+
 ## v2.13.1 - 98 (2022-01-09)
 
 - Fix various TalkBack-related bugs

FUNDING.yml

@@ -0,0 +1,3 @@
+github: TheLastProject
+custom:
+  - "https://paypal.me/sylviavanos"

app/build.gradle

@@ -18,8 +18,8 @@ android {
         applicationId "me.hackerchick.catima"
         minSdkVersion 21
         targetSdkVersion 31
-        versionCode 98
-        versionName "2.13.1"
+        versionCode 103
+        versionName "2.15.2"
 
         vectorDrawables.useSupportLibrary true
         multiDexEnabled true
@@ -80,17 +80,17 @@ android {
 
 dependencies {
 // AndroidX
-    implementation 'androidx.appcompat:appcompat:1.4.0'
-    implementation 'androidx.constraintlayout:constraintlayout:2.1.2'
+    implementation 'androidx.appcompat:appcompat:1.4.1'
+    implementation 'androidx.constraintlayout:constraintlayout:2.1.3'
     implementation 'androidx.exifinterface:exifinterface:1.3.3'
     implementation 'androidx.palette:palette:1.0.0'
-    implementation 'androidx.preference:preference:1.1.1'
-    implementation 'com.google.android.material:material:1.4.0'
-    implementation 'com.github.yalantis:ucrop:2.2.7'
+    implementation 'androidx.preference:preference:1.2.0'
+    implementation 'com.google.android.material:material:1.5.0'
+    implementation 'com.github.yalantis:ucrop:2.2.8'
     coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.1.5'
 
 // Splash Screen
-    implementation 'androidx.core:core-splashscreen:1.0.0-alpha02'
+    implementation 'androidx.core:core-splashscreen:1.0.0-beta01'
 
 // Third-party
     implementation 'com.journeyapps:zxing-android-embedded:4.3.0@aar'

app/src/main/AndroidManifest.xml

@@ -116,7 +116,7 @@
         </activity>
 
         <activity
-            android:name="com.yalantis.ucrop.UCropActivity"
+            android:name=".UCropWrapper"
             android:theme="@style/AppTheme.NoActionBar" />
 
         <provider

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

@@ -151,13 +151,13 @@ public class AboutActivity extends CatimaAppCompatActivity implements View.OnCli
         } else if (id == R.id.translate) {
             url = "https://hosted.weblate.org/engage/catima/";
         } else if (id == R.id.license) {
-            url = "https://github.com/TheLastProject/Catima/blob/master/LICENSE";
+            url = "https://github.com/CatimaLoyalty/Android/blob/master/LICENSE";
         } else if (id == R.id.repo) {
-            url = "https://github.com/TheLastProject/Catima/";
+            url = "https://github.com/CatimaLoyalty/Android/";
         } else if (id == R.id.privacy) {
             url = "https://catima.app/privacy-policy/";
         } else if (id == R.id.report_error) {
-            url = "https://github.com/TheLastProject/Catima/issues";
+            url = "https://github.com/CatimaLoyalty/Android/issues";
         } else if (id == R.id.rate) {
             url = "https://play.google.com/store/apps/details?id=me.hackerchick.catima";
         } else {

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

@@ -1,20 +1,15 @@
 package protect.card_locker;
 
 import android.content.Context;
-import android.content.SharedPreferences;
-import android.content.res.Resources;
-import android.util.TypedValue;
+import android.graphics.Color;
+import android.os.Build;
+import android.os.Bundle;
+import android.view.View;
 
+import androidx.annotation.Nullable;
 import androidx.appcompat.app.AppCompatActivity;
-import androidx.preference.PreferenceManager;
-
-import java.util.HashMap;
 
 public class CatimaAppCompatActivity extends AppCompatActivity {
-
-    SharedPreferences pref;
-    HashMap<String, Integer> supportedThemes;
-
     @Override
     protected void attachBaseContext(Context base) {
         // Apply chosen language
@@ -22,32 +17,28 @@ public class CatimaAppCompatActivity extends AppCompatActivity {
     }
 
     @Override
-    public Resources.Theme getTheme() {
-        if (supportedThemes == null) {
-            supportedThemes = new HashMap<>();
-            supportedThemes.put(getString(R.string.settings_key_blue_theme), R.style.AppTheme_blue);
-            supportedThemes.put(getString(R.string.settings_key_brown_theme), R.style.AppTheme_brown);
-            supportedThemes.put(getString(R.string.settings_key_green_theme), R.style.AppTheme_green);
-            supportedThemes.put(getString(R.string.settings_key_grey_theme), R.style.AppTheme_grey);
-            supportedThemes.put(getString(R.string.settings_key_magenta_theme), R.style.AppTheme_magenta);
-            supportedThemes.put(getString(R.string.settings_key_pink_theme), R.style.AppTheme_pink);
-            supportedThemes.put(getString(R.string.settings_key_sky_blue_theme), R.style.AppTheme_sky_blue);
-            supportedThemes.put(getString(R.string.settings_key_violet_theme), R.style.AppTheme_violet);
+    protected void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        // XXX splash screen activity has to do this after installing splash screen before view inflate
+        if (!this.getClass().getSimpleName().equals(MainActivity.class.getSimpleName())) {
+            Utils.patchColors(this);
         }
-
-        Resources.Theme theme = super.getTheme();
-        pref = PreferenceManager.getDefaultSharedPreferences(getApplicationContext());
-        String themeName = pref.getString(getString(R.string.setting_key_theme_color), getString(R.string.settings_key_catima_theme));
-
-        theme.applyStyle(Utils.mapGetOrDefault(supportedThemes, themeName, R.style.AppTheme_NoActionBar), true);
-
-        return theme;
     }
 
-    public int getThemeColor() {
-        TypedValue typedValue = new TypedValue();
-        Resources.Theme theme = getTheme();
-        theme.resolveAttribute(R.attr.colorPrimary, typedValue, true);
-        return typedValue.data;
+    @Override
+    protected void onPostCreate(@Nullable Bundle savedInstanceState) {
+        super.onPostCreate(savedInstanceState);
+        // material 3 designer does not consider status bar colors
+        // XXX changing this in onCreate causes issues with the splash screen activity, so doing this here
+        boolean darkMode = Utils.isDarkModeEnabled(this);
+        if (Build.VERSION.SDK_INT >= 23) {
+            getWindow().setStatusBarColor(Color.TRANSPARENT);
+            getWindow().getDecorView().setSystemUiVisibility(darkMode ? 0 : View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR);
+        } else {
+            // icons are always white back then
+            getWindow().setStatusBarColor(darkMode ? Color.TRANSPARENT : Color.argb(127, 0, 0, 0));
+        }
+        // XXX android 9 and below has a nasty rendering bug if the theme was patched earlier
+        Utils.postPatchColors(this);
     }
 }

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

@@ -15,7 +15,7 @@ import protect.card_locker.preferences.Settings;
 
 public class GroupCursorAdapter extends BaseCursorAdapter<GroupCursorAdapter.GroupListItemViewHolder> {
     Settings mSettings;
-    private final Context mContext;
+    public final Context mContext;
     private final GroupAdapterListener mListener;
     SQLiteDatabase mDatabase;
 
@@ -23,7 +23,7 @@ public class GroupCursorAdapter extends BaseCursorAdapter<GroupCursorAdapter.Gro
         super(inputCursor, DBHelper.LoyaltyCardDbGroups.ORDER);
         setHasStableIds(true);
         mSettings = new Settings(inputContext);
-        mContext = inputContext.getApplicationContext();
+        mContext = inputContext;
         mListener = inputListener;
         mDatabase = new DBHelper(inputContext).getReadableDatabase();
 

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

@@ -35,6 +35,7 @@ import java.util.List;
 import protect.card_locker.async.TaskHandler;
 import protect.card_locker.importexport.DataFormat;
 import protect.card_locker.importexport.ImportExportResult;
+import protect.card_locker.importexport.ImportExportResultType;
 
 public class ImportExportActivity extends CatimaAppCompatActivity {
     private static final String TAG = "Catima";
@@ -97,7 +98,7 @@ public class ImportExportActivity extends CatimaAppCompatActivity {
                 startExport(writer, uri, exportPassword.toCharArray(), true);
             } catch (IOException e) {
                 Log.e(TAG, "Failed to export file: " + result.toString(), e);
-                onExportComplete(ImportExportResult.GenericFailure, uri);
+                onExportComplete(new ImportExportResult(ImportExportResultType.GenericFailure, result.toString()), uri);
             }
 
         });
@@ -175,7 +176,7 @@ public class ImportExportActivity extends CatimaAppCompatActivity {
             startImport(reader, uri, importDataFormat, password, true);
         } catch (IOException e) {
             Log.e(TAG, "Failed to import file: " + uri.toString(), e);
-            onImportComplete(ImportExportResult.GenericFailure, uri, importDataFormat);
+            onImportComplete(new ImportExportResult(ImportExportResultType.GenericFailure, e.toString()), uri, importDataFormat);
         }
     }
 
@@ -357,56 +358,51 @@ public class ImportExportActivity extends CatimaAppCompatActivity {
         builder.show();
     }
 
+    private String buildResultDialogMessage(ImportExportResult result, boolean isImport) {
+        int messageId;
+
+        if (result.resultType() == ImportExportResultType.Success) {
+            messageId = isImport ? R.string.importSuccessful : R.string.exportSuccessful;
+        } else {
+            messageId = isImport ? R.string.importFailed : R.string.exportFailed;
+        }
+
+        StringBuilder messageBuilder = new StringBuilder(getResources().getString(messageId));
+        if (result.developerDetails() != null) {
+            messageBuilder.append("\n\n");
+            messageBuilder.append(getResources().getString(R.string.include_if_asking_support));
+            messageBuilder.append("\n\n");
+            messageBuilder.append(result.developerDetails());
+        }
+
+        return messageBuilder.toString();
+    }
+
     private void onImportComplete(ImportExportResult result, Uri path, DataFormat dataFormat) {
-        if (result == ImportExportResult.BadPassword) {
+        ImportExportResultType resultType = result.resultType();
+
+        if (resultType == ImportExportResultType.BadPassword) {
             retryWithPassword(dataFormat, path);
             return;
         }
 
         AlertDialog.Builder builder = new AlertDialog.Builder(this);
-
-        int messageId;
-
-        if (result == ImportExportResult.Success) {
-            builder.setTitle(R.string.importSuccessfulTitle);
-            messageId = R.string.importSuccessful;
-        } else {
-            builder.setTitle(R.string.importFailedTitle);
-            messageId = R.string.importFailed;
-        }
-
-        final String message = getResources().getString(messageId);
-
-        builder.setMessage(message);
-        builder.setNeutralButton(R.string.ok, new DialogInterface.OnClickListener() {
-            @Override
-            public void onClick(DialogInterface dialog, int which) {
-                dialog.dismiss();
-            }
-        });
+        builder.setTitle(resultType == ImportExportResultType.Success ? R.string.importSuccessfulTitle : R.string.importFailedTitle);
+        builder.setMessage(buildResultDialogMessage(result, true));
+        builder.setNeutralButton(R.string.ok, (dialog, which) -> dialog.dismiss());
 
         builder.create().show();
     }
 
     private void onExportComplete(ImportExportResult result, final Uri path) {
+        ImportExportResultType resultType = result.resultType();
+
         AlertDialog.Builder builder = new AlertDialog.Builder(this);
-
-        int messageId;
-
-        if (result == ImportExportResult.Success) {
-            builder.setTitle(R.string.exportSuccessfulTitle);
-            messageId = R.string.exportSuccessful;
-        } else {
-            builder.setTitle(R.string.exportFailedTitle);
-            messageId = R.string.exportFailed;
-        }
-
-        final String message = getResources().getString(messageId);
-
-        builder.setMessage(message);
+        builder.setTitle(resultType == ImportExportResultType.Success ? R.string.exportSuccessfulTitle : R.string.exportFailedTitle);
+        builder.setMessage(buildResultDialogMessage(result, false));
         builder.setNeutralButton(R.string.ok, (dialog, which) -> dialog.dismiss());
 
-        if (result == ImportExportResult.Success) {
+        if (resultType == ImportExportResultType.Success) {
             final CharSequence sendLabel = ImportExportActivity.this.getResources().getText(R.string.sendLabel);
 
             builder.setPositiveButton(sendLabel, (dialog, which) -> {

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

@@ -16,6 +16,7 @@ import java.nio.charset.StandardCharsets;
 import protect.card_locker.async.CompatCallable;
 import protect.card_locker.importexport.DataFormat;
 import protect.card_locker.importexport.ImportExportResult;
+import protect.card_locker.importexport.ImportExportResultType;
 import protect.card_locker.importexport.MultiFormatExporter;
 import protect.card_locker.importexport.MultiFormatImporter;
 
@@ -63,19 +64,20 @@ public class ImportExportTask implements CompatCallable<ImportExportResult> {
     private ImportExportResult performImport(Context context, InputStream stream, SQLiteDatabase database, char[] password) {
         ImportExportResult importResult = MultiFormatImporter.importData(context, database, stream, format, password);
 
-        Log.i(TAG, "Import result: " + importResult.name());
+        Log.i(TAG, "Import result: " + importResult);
 
         return importResult;
     }
 
     private ImportExportResult performExport(Context context, OutputStream stream, SQLiteDatabase database, char[] password) {
-        ImportExportResult result = ImportExportResult.GenericFailure;
+        ImportExportResult result;
 
         try {
             OutputStreamWriter writer = new OutputStreamWriter(stream, StandardCharsets.UTF_8);
             result = MultiFormatExporter.exportData(context, database, stream, format, password);
             writer.close();
         } catch (IOException e) {
+            result = new ImportExportResult(ImportExportResultType.GenericFailure, e.toString());
             Log.e(TAG, "Unable to export file", e);
         }
 

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

@@ -35,7 +35,7 @@ public class LoyaltyCardCursorAdapter extends BaseCursorAdapter<LoyaltyCardCurso
     private int mCurrentSelectedIndex = -1;
     Settings mSettings;
     boolean mDarkModeEnabled;
-    private final Context mContext;
+    public final Context mContext;
     private final CardAdapterListener mListener;
     protected SparseBooleanArray mSelectedItems;
     protected SparseBooleanArray mAnimationItemsIndex;
@@ -46,7 +46,7 @@ public class LoyaltyCardCursorAdapter extends BaseCursorAdapter<LoyaltyCardCurso
         super(inputCursor, DBHelper.LoyaltyCardDbIds.ID);
         setHasStableIds(true);
         mSettings = new Settings(inputContext);
-        mContext = inputContext.getApplicationContext();
+        mContext = inputContext;
         mListener = inputListener;
         mSelectedItems = new SparseBooleanArray();
         mAnimationItemsIndex = new SparseBooleanArray();
@@ -110,7 +110,7 @@ public class LoyaltyCardCursorAdapter extends BaseCursorAdapter<LoyaltyCardCurso
             inputHolder.mCardIcon.setImageBitmap(Utils.generateIcon(mContext, loyaltyCard.store, loyaltyCard.headerColor).getLetterTile());
             inputHolder.mCardIcon.setScaleType(ImageView.ScaleType.FIT_CENTER);
         }
-        inputHolder.setIconBackgroundColor(loyaltyCard.headerColor != null ? loyaltyCard.headerColor : ContextCompat.getColor(mContext, R.color.colorPrimary));
+        inputHolder.setIconBackgroundColor(loyaltyCard.headerColor != null ? loyaltyCard.headerColor : R.attr.colorPrimary);
 
         inputHolder.toggleStar(loyaltyCard.starStatus != 0, itemSelected(inputCursor.getPosition()));
 

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

@@ -36,6 +36,7 @@ import android.widget.Toast;
 
 import com.google.android.material.chip.Chip;
 import com.google.android.material.chip.ChipGroup;
+import com.google.android.material.color.MaterialColors;
 import com.google.android.material.floatingactionbutton.FloatingActionButton;
 import com.google.android.material.snackbar.Snackbar;
 import com.google.android.material.tabs.TabLayout;
@@ -68,6 +69,7 @@ import androidx.activity.result.contract.ActivityResultContracts;
 import androidx.annotation.NonNull;
 import androidx.appcompat.app.ActionBar;
 import androidx.appcompat.app.AlertDialog;
+import androidx.appcompat.widget.AppCompatTextView;
 import androidx.appcompat.widget.Toolbar;
 import androidx.core.content.ContextCompat;
 import androidx.core.content.FileProvider;
@@ -134,6 +136,8 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity {
 
     Button enterButton;
 
+    Toolbar toolbar;
+
     int loyaltyCardId;
     boolean updateLoyaltyCard;
     String cardId;
@@ -290,7 +294,7 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity {
         super.onCreate(savedInstanceState);
 
         setContentView(R.layout.loyalty_card_edit_activity);
-        Toolbar toolbar = findViewById(R.id.toolbar);
+        toolbar = findViewById(R.id.toolbar);
         setSupportActionBar(toolbar);
         ActionBar actionBar = getSupportActionBar();
         if (actionBar != null) {
@@ -327,8 +331,6 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity {
         cardImageBack = findViewById(R.id.backImage);
 
         enterButton = findViewById(R.id.enterButton);
-        cardImageFront.setBackgroundColor(getThemeColor());
-        cardImageBack.setBackgroundColor(getThemeColor());
 
         barcodeImageGenerationFinishedCallback = () -> {
             if (!(boolean) barcodeImage.getTag()) {
@@ -446,14 +448,10 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity {
 
                     for (int i = locales.size() - 1; i >= 0; i--) {
                         Locale locale = locales.get(i);
-                        String currencySymbol = Currency.getInstance(locale).getSymbol();
-                        currencyList.remove(currencySymbol);
-                        currencyList.add(0, currencySymbol);
+                        currencyPrioritizeLocaleSymbols(currencyList, locale);
                     }
                 } else {
-                    String currencySymbol = Currency.getInstance(mSystemLocale).getSymbol();
-                    currencyList.remove(currencySymbol);
-                    currencyList.add(0, currencySymbol);
+                    currencyPrioritizeLocaleSymbols(currencyList, mSystemLocale);
                 }
 
                 currencyList.add(0, getString(R.string.points));
@@ -670,7 +668,6 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity {
         });
 
         mCropperOptions = new UCrop.Options();
-        setCropperTheme();
     }
 
     // ucrop 2.2.6 initial aspect ratio is glitched when 0x0 is used as the initial ratio option
@@ -690,13 +687,24 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity {
                 new AspectRatio(getResources().getString(R.string.ucrop_label_original).toUpperCase(), sourceWidth, sourceHeight),
                 new AspectRatio(getResources().getString(R.string.card).toUpperCase(), 85.6f, 53.98f)
         );
-    }
 
-    private void setCropperTheme() {
-        mCropperOptions.setToolbarColor(getThemeColor());
-        mCropperOptions.setStatusBarColor(getThemeColor());
-        mCropperOptions.setToolbarWidgetColor(Color.WHITE);
-        mCropperOptions.setActiveControlsWidgetColor(getThemeColor());
+        // Fix theming
+
+        int colorPrimary = MaterialColors.getColor(this, R.attr.colorPrimary, ContextCompat.getColor(this, R.color.md_theme_light_primary));
+        int colorOnPrimary = MaterialColors.getColor(this, R.attr.colorOnPrimary, ContextCompat.getColor(this, R.color.md_theme_light_onPrimary));
+        int colorSurface = MaterialColors.getColor(this, R.attr.colorSurface, ContextCompat.getColor(this, R.color.md_theme_light_surface));
+        int colorOnSurface = MaterialColors.getColor(this, R.attr.colorOnSurface, ContextCompat.getColor(this, R.color.md_theme_light_onSurface));
+        int colorBackground = MaterialColors.getColor(this, android.R.attr.colorBackground, ContextCompat.getColor(this, R.color.md_theme_light_onSurface));
+        mCropperOptions.setToolbarColor(colorSurface);
+        mCropperOptions.setStatusBarColor(colorSurface);
+        mCropperOptions.setToolbarWidgetColor(colorOnSurface);
+        mCropperOptions.setRootViewBackgroundColor(colorBackground);
+        // set tool tip to be the darker of primary color
+        if (Utils.isDarkModeEnabled(this)) {
+            mCropperOptions.setActiveControlsWidgetColor(colorOnPrimary);
+        } else {
+            mCropperOptions.setActiveControlsWidgetColor(colorPrimary);
+        }
     }
 
     @Override
@@ -910,7 +918,7 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity {
     protected void setColorFromIcon() {
         Object icon = thumbnail.getTag();
         if (icon != null && (icon instanceof Bitmap)) {
-            updateTempState(LoyaltyCardField.headerColor, new Palette.Builder((Bitmap) icon).generate().getDominantColor(tempLoyaltyCard.headerColor != null ? tempLoyaltyCard.headerColor : ContextCompat.getColor(this, R.color.colorPrimary)));
+            updateTempState(LoyaltyCardField.headerColor, new Palette.Builder((Bitmap) icon).generate().getDominantColor(tempLoyaltyCard.headerColor != null ? tempLoyaltyCard.headerColor : R.attr.colorPrimary));
         } else {
             Log.d("setColorFromIcon", "attempting header color change from icon but icon does not exist");
         }
@@ -1395,13 +1403,22 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity {
                 }
             }
         }
-        mCropperLauncher.launch(
-                UCrop.of(
-                        sourceUri,
-                        destUri
-                ).withOptions(mCropperOptions)
-                        .getIntent(this)
-        );
+        Intent ucropIntent = UCrop.of(
+                sourceUri,
+                destUri
+        ).withOptions(mCropperOptions)
+                .getIntent(this);
+        ucropIntent.setClass(this, UCropWrapper.class);
+        for (int i = 0; i < toolbar.getChildCount(); i++) {
+            // send toolbar font details to ucrop wrapper
+            View child = toolbar.getChildAt(i);
+            if (child instanceof AppCompatTextView) {
+                AppCompatTextView childTextView = (AppCompatTextView) child;
+                ucropIntent.putExtra(UCropWrapper.UCROP_TOOLBAR_TYPEFACE_STYLE, childTextView.getTypeface().getStyle());
+                break;
+            }
+        }
+        mCropperLauncher.launch(ucropIntent);
     }
 
     private void generateBarcode() {
@@ -1492,4 +1509,14 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity {
             throw new UnsupportedOperationException();
         }
     }
+
+    private void currencyPrioritizeLocaleSymbols(ArrayList<String> currencyList, Locale locale) {
+        try {
+            String currencySymbol = Currency.getInstance(locale).getSymbol();
+            currencyList.remove(currencySymbol);
+            currencyList.add(0, currencySymbol);
+        } catch (IllegalArgumentException e) {
+            Log.d(TAG, "Could not get currency data for locale info: " + e);
+        }
+    }
 }

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

@@ -3,6 +3,9 @@ package protect.card_locker;
 import android.app.Application;
 
 import androidx.appcompat.app.AppCompatDelegate;
+
+import com.google.android.material.color.DynamicColors;
+
 import protect.card_locker.preferences.Settings;
 
 public class LoyaltyCardLockerApplication extends Application {

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

@@ -2,6 +2,7 @@ package protect.card_locker;
 
 import android.content.Intent;
 import android.content.pm.ActivityInfo;
+import android.content.res.ColorStateList;
 import android.content.res.Configuration;
 import android.database.sqlite.SQLiteDatabase;
 import android.graphics.Bitmap;
@@ -32,6 +33,7 @@ import android.widget.Toast;
 
 import com.google.android.material.appbar.AppBarLayout;
 import com.google.android.material.bottomsheet.BottomSheetBehavior;
+import com.google.android.material.color.MaterialColors;
 import com.google.android.material.floatingactionbutton.FloatingActionButton;
 
 import java.io.UnsupportedEncodingException;
@@ -285,9 +287,6 @@ public class LoyaltyCardViewActivity extends CatimaAppCompatActivity implements
 
         centerGuideline = findViewById(R.id.centerGuideline);
         barcodeScaler = findViewById(R.id.barcodeScaler);
-        maximizeButton.setBackgroundColor(getThemeColor());
-        minimizeButton.setBackgroundColor(getThemeColor());
-        bottomSheetButton.setBackgroundColor(getThemeColor());
         barcodeScaler.setOnSeekBarChangeListener(new SeekBar.OnSeekBarChangeListener() {
             @Override
             public void onProgressChanged(SeekBar seekBar, int progress, boolean fromUser) {
@@ -530,7 +529,7 @@ public class LoyaltyCardViewActivity extends CatimaAppCompatActivity implements
             int expiryString = R.string.expiryStateSentence;
             if (Utils.hasExpired(loyaltyCard.expiry)) {
                 expiryString = R.string.expiryStateSentenceExpired;
-                expiryView.setTextColor(ContextCompat.getColor(getApplicationContext(), R.color.alert));
+                expiryView.setTextColor(Color.RED);
             }
             expiryView.setText(getString(expiryString, DateFormat.getDateInstance(DateFormat.LONG).format(loyaltyCard.expiry)));
             expiryView.setTextSize(settings.getFontSizeMax(settings.getMediumFont()));
@@ -568,6 +567,30 @@ public class LoyaltyCardViewActivity extends CatimaAppCompatActivity implements
         storeName.setTextColor(textColor);
         landscapeToolbar.setTitleTextColor(textColor);
 
+        // Also apply colours to UI elements
+        int darkenedColor = ColorUtils.blendARGB(backgroundHeaderColor, Color.BLACK, 0.1f);
+        barcodeScaler.setProgressTintList(ColorStateList.valueOf(darkenedColor));
+        barcodeScaler.setThumbTintList(ColorStateList.valueOf(darkenedColor));
+        maximizeButton.setBackgroundColor(darkenedColor);
+        minimizeButton.setBackgroundColor(darkenedColor);
+        bottomSheetButton.setBackgroundColor(darkenedColor);
+        maximizeButton.setColorFilter(textColor);
+        minimizeButton.setColorFilter(textColor);
+        bottomSheetButton.setColorFilter(textColor);
+        int complementaryColor = Utils.getComplementaryColor(darkenedColor);
+        editButton.setBackgroundTintList(ColorStateList.valueOf(complementaryColor));
+        Drawable editButtonIcon = editButton.getDrawable();
+        editButtonIcon.mutate();
+        int colorPrimary = MaterialColors.getColor(this, R.attr.colorPrimary, ContextCompat.getColor(this, R.color.md_theme_light_primary));
+        int colorOnPrimary = MaterialColors.getColor(this, R.attr.colorOnPrimary, ContextCompat.getColor(this, R.color.md_theme_light_onPrimary));
+        boolean darkMode = Utils.isDarkModeEnabled(this);
+        if (Utils.needsDarkForeground(complementaryColor)) {
+            editButtonIcon.setTint(darkMode ? colorOnPrimary : colorPrimary);
+        } else {
+            editButtonIcon.setTint(darkMode ? colorPrimary : colorOnPrimary);
+        }
+        editButton.setImageDrawable(editButtonIcon);
+
         Bitmap icon = Utils.retrieveCardImage(this, loyaltyCard.id, ImageLocationType.icon);
         if (icon != null) {
             int backgroundAlphaColor = Utils.needsDarkForeground(backgroundHeaderColor) ? Color.WHITE : Color.BLACK;
@@ -628,7 +651,6 @@ public class LoyaltyCardViewActivity extends CatimaAppCompatActivity implements
         dotIndicator.removeAllViews();
         if (imageTypes.size() >= 2) {
             dots = new ImageView[imageTypes.size()];
-            boolean darkMode = Utils.isDarkModeEnabled(getApplicationContext());
 
             for (int i = 0; i < imageTypes.size(); i++) {
                 dots[i] = new ImageView(this);

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

@@ -47,6 +47,7 @@ public class MainActivity extends CatimaAppCompatActivity implements LoyaltyCard
     private ActionMode mCurrentActionMode;
     private SearchView mSearchView;
     private GestureDetector mGestureDetector;
+    private int mLoyaltyCardCount = 0;
     protected String mFilter = "";
     protected Object mGroup = null;
     protected DBHelper.LoyaltyCardOrder mOrder = DBHelper.LoyaltyCardOrder.Alpha;
@@ -140,8 +141,6 @@ public class MainActivity extends CatimaAppCompatActivity implements LoyaltyCard
                 }
 
                 builder.setPositiveButton(R.string.confirm, (dialog, which) -> {
-                    DBHelper db = new DBHelper(MainActivity.this);
-
                     for (LoyaltyCard loyaltyCard : mAdapter.getSelectedItems()) {
                         Log.e(TAG, "Deleting card: " + loyaltyCard.id);
 
@@ -153,7 +152,7 @@ public class MainActivity extends CatimaAppCompatActivity implements LoyaltyCard
                     TabLayout.Tab tab = ((TabLayout) findViewById(R.id.groups)).getTabAt(selectedTab);
                     mGroup = tab != null ? tab.getTag() : null;
 
-                    updateLoyaltyCardList();
+                    updateLoyaltyCardList(true);
 
                     dialog.dismiss();
                 });
@@ -179,6 +178,8 @@ public class MainActivity extends CatimaAppCompatActivity implements LoyaltyCard
         super.onCreate(inputSavedInstanceState);
         SplashScreen.installSplashScreen(this);
         setTitle(R.string.app_name);
+        // XXX color patching has to be done again after setting splash screen
+        Utils.patchColors(this);
         setContentView(R.layout.main_activity);
         Toolbar toolbar = findViewById(R.id.toolbar);
         setSupportActionBar(toolbar);
@@ -192,7 +193,7 @@ public class MainActivity extends CatimaAppCompatActivity implements LoyaltyCard
                 selectedTab = tab.getPosition();
                 Log.d("onTabSelected", "Tab Position " + tab.getPosition());
                 mGroup = tab.getTag();
-                updateLoyaltyCardList();
+                updateLoyaltyCardList(false);
                 // Store active tab in Shared Preference to restore next app launch
                 SharedPreferences activeTabPref = getApplicationContext().getSharedPreferences(
                         getString(R.string.sharedpreference_active_tab),
@@ -232,7 +233,7 @@ public class MainActivity extends CatimaAppCompatActivity implements LoyaltyCard
         registerForContextMenu(mCardList);
 
         mGroup = null;
-        updateLoyaltyCardList();
+        updateLoyaltyCardList(true);
 
         /*
          * This was added for Huawei, but Huawei is just too much of a fucking pain.
@@ -336,7 +337,7 @@ public class MainActivity extends CatimaAppCompatActivity implements LoyaltyCard
             assert tab != null;
             mGroup = tab.getTag();
         }
-        updateLoyaltyCardList();
+        updateLoyaltyCardList(true);
         // End of active tab logic
 
         FloatingActionButton addButton = findViewById(R.id.fabAdd);
@@ -362,7 +363,17 @@ public class MainActivity extends CatimaAppCompatActivity implements LoyaltyCard
         super.onBackPressed();
     }
 
-    private void updateLoyaltyCardList() {
+    private void displayCardSetupOptions(Menu menu, boolean shouldShow) {
+        for (int id : new int[]{R.id.action_search, R.id.action_unfold, R.id.action_sort}) {
+            menu.findItem(id).setVisible(shouldShow);
+        }
+    }
+
+    private void updateLoyaltyCardCount() {
+        mLoyaltyCardCount = DBHelper.getLoyaltyCardCount(mDatabase);
+    }
+
+    private void updateLoyaltyCardList(boolean updateCount) {
         Group group = null;
         if (mGroup != null) {
             group = (Group) mGroup;
@@ -370,12 +381,19 @@ public class MainActivity extends CatimaAppCompatActivity implements LoyaltyCard
 
         mAdapter.swapCursor(DBHelper.getLoyaltyCardCursor(mDatabase, mFilter, group, mOrder, mOrderDirection));
 
-        if (DBHelper.getLoyaltyCardCount(mDatabase) > 0) {
+        if (updateCount) {
+            updateLoyaltyCardCount();
+            // Update menu icons if necessary
+            invalidateOptionsMenu();
+        }
+
+        if (mLoyaltyCardCount > 0) {
             // We want the cardList to be visible regardless of the filtered match count
             // to ensure that the noMatchingCardsText doesn't end up being shown below
             // the keyboard
             mHelpText.setVisibility(View.GONE);
             mNoGroupCardsText.setVisibility(View.GONE);
+
             if (mAdapter.getItemCount() > 0) {
                 mCardList.setVisibility(View.VISIBLE);
                 mNoMatchingCardsText.setVisibility(View.GONE);
@@ -394,6 +412,7 @@ public class MainActivity extends CatimaAppCompatActivity implements LoyaltyCard
         } else {
             mCardList.setVisibility(View.GONE);
             mHelpText.setVisibility(View.VISIBLE);
+
             mNoMatchingCardsText.setVisibility(View.GONE);
             mNoGroupCardsText.setVisibility(View.GONE);
         }
@@ -433,6 +452,8 @@ public class MainActivity extends CatimaAppCompatActivity implements LoyaltyCard
     public boolean onCreateOptionsMenu(Menu inputMenu) {
         getMenuInflater().inflate(R.menu.main_menu, inputMenu);
 
+        displayCardSetupOptions(inputMenu, mLoyaltyCardCount > 0);
+
         SearchManager searchManager = (SearchManager) getSystemService(Context.SEARCH_SERVICE);
         if (searchManager != null) {
             mSearchView = (SearchView) inputMenu.findItem(R.id.action_search).getActionView();
@@ -458,7 +479,7 @@ public class MainActivity extends CatimaAppCompatActivity implements LoyaltyCard
                     TabLayout.Tab currentTab = groupsTabLayout.getTabAt(groupsTabLayout.getSelectedTabPosition());
                     mGroup = currentTab != null ? currentTab.getTag() : null;
 
-                    updateLoyaltyCardList();
+                    updateLoyaltyCardList(false);
 
                     return true;
                 }
@@ -488,7 +509,6 @@ public class MainActivity extends CatimaAppCompatActivity implements LoyaltyCard
         }
 
         if (id == R.id.action_sort) {
-            TabLayout.Tab tab = ((TabLayout) findViewById(R.id.groups)).getTabAt(selectedTab);
             AtomicInteger currentIndex = new AtomicInteger();
             List<DBHelper.LoyaltyCardOrder> loyaltyCardOrders = Arrays.asList(DBHelper.LoyaltyCardOrder.values());
             for (int i = 0; i < loyaltyCardOrders.size(); i++) {
@@ -568,7 +588,7 @@ public class MainActivity extends CatimaAppCompatActivity implements LoyaltyCard
         sortPrefEditor.apply();
 
         // Update card list
-        updateLoyaltyCardList();
+        updateLoyaltyCardList(false);
     }
 
     @Override

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

@@ -109,7 +109,7 @@ public class ManageGroupsActivity extends CatimaAppCompatActivity implements Gro
     }
 
     private void createGroup() {
-        AlertDialog.Builder builder = new AlertDialog.Builder(this, R.style.AlertDialogTheme);
+        AlertDialog.Builder builder = new AlertDialog.Builder(this);
         builder.setTitle(R.string.enter_group_name);
         final EditText input = new EditText(this);
         input.setInputType(InputType.TYPE_CLASS_TEXT);

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

@@ -0,0 +1,79 @@
+package protect.card_locker;
+
+import android.content.Intent;
+import android.graphics.Color;
+import android.graphics.Typeface;
+import android.graphics.drawable.Drawable;
+import android.os.Build;
+import android.os.Bundle;
+import android.view.View;
+import android.widget.FrameLayout;
+import android.widget.LinearLayout;
+
+import androidx.annotation.Nullable;
+import androidx.appcompat.widget.AppCompatImageView;
+import androidx.core.content.ContextCompat;
+import androidx.core.graphics.ColorUtils;
+
+import com.google.android.material.color.MaterialColors;
+import com.google.android.material.textview.MaterialTextView;
+import com.yalantis.ucrop.UCropActivity;
+
+public class UCropWrapper extends UCropActivity {
+    public static final String UCROP_TOOLBAR_TYPEFACE_STYLE = "ucop_toolbar_typeface_style";
+
+    @Override
+    protected void onPostCreate(@Nullable Bundle savedInstanceState) {
+        super.onPostCreate(savedInstanceState);
+        boolean darkMode = Utils.isDarkModeEnabled(this);
+        // setup status bar to look like the rest of the app
+        if (Build.VERSION.SDK_INT >= 23) {
+            getWindow().getDecorView().setSystemUiVisibility(darkMode ? 0 : View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR);
+        } else {
+            // icons are always white back then
+            if (!darkMode) {
+                getWindow().setStatusBarColor(ColorUtils.compositeColors(Color.argb(127, 0, 0, 0), getWindow().getStatusBarColor()));
+            }
+        }
+
+        // find and check views that we wish to color modify
+        // for when we update ucrop or switch to another cropper
+        View check = findViewById(com.yalantis.ucrop.R.id.wrapper_controls);
+        if (check instanceof FrameLayout) {
+            FrameLayout controls = (FrameLayout) check;
+            check = findViewById(com.yalantis.ucrop.R.id.wrapper_states);
+            if (check instanceof LinearLayout) {
+                LinearLayout states = (LinearLayout) check;
+                for (int i = 0; i < controls.getChildCount(); i++) {
+                    check = controls.getChildAt(i);
+                    if (check instanceof AppCompatImageView) {
+                        AppCompatImageView controlsBackgroundImage = (AppCompatImageView) check;
+                        // everything gathered and are as expected, now perform color patching
+                        Utils.patchColors(this);
+                        int colorSurface = MaterialColors.getColor(this, R.attr.colorSurface, ContextCompat.getColor(this, R.color.md_theme_light_surface));
+                        int colorOnSurface = MaterialColors.getColor(this, R.attr.colorOnSurface, ContextCompat.getColor(this, R.color.md_theme_light_onSurface));
+
+                        Drawable controlsBackgroundImageDrawable = controlsBackgroundImage.getBackground();
+                        controlsBackgroundImageDrawable.mutate();
+                        controlsBackgroundImageDrawable.setTint(darkMode ? colorOnSurface : colorSurface);
+                        controlsBackgroundImage.setBackgroundDrawable(controlsBackgroundImageDrawable);
+
+                        states.setBackgroundColor(darkMode ? colorSurface : colorOnSurface);
+                        break;
+                    }
+                }
+            }
+        }
+
+        // change toolbar font
+        check = findViewById(com.yalantis.ucrop.R.id.toolbar_title);
+        if (check instanceof MaterialTextView) {
+            MaterialTextView toolbarTextview = (MaterialTextView) check;
+            Intent intent = getIntent();
+            int style = intent.getIntExtra(UCROP_TOOLBAR_TYPEFACE_STYLE, -1);
+            if (style != -1) {
+                toolbarTextview.setTypeface(Typeface.defaultFromStyle(style));
+            }
+        }
+    }
+}

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

@@ -14,8 +14,10 @@ import android.os.Build;
 import android.os.LocaleList;
 import android.provider.MediaStore;
 import android.util.Log;
+import android.util.TypedValue;
 import android.widget.Toast;
 
+import com.google.android.material.color.DynamicColors;
 import com.google.zxing.BinaryBitmap;
 import com.google.zxing.LuminanceSource;
 import com.google.zxing.MultiFormatReader;
@@ -39,9 +41,11 @@ import java.util.GregorianCalendar;
 import java.util.Locale;
 import java.util.Map;
 
+import androidx.appcompat.app.AppCompatActivity;
 import androidx.appcompat.app.AppCompatDelegate;
 import androidx.core.graphics.ColorUtils;
 import androidx.exifinterface.media.ExifInterface;
+
 import protect.card_locker.preferences.Settings;
 
 public class Utils {
@@ -206,7 +210,7 @@ public class Utils {
 
         if (currency == null) {
             numberFormat.setMaximumFractionDigits(0);
-            return context.getString(R.string.balancePoints, numberFormat.format(value));
+            return context.getResources().getQuantityString(R.plurals.balancePoints, value.intValue(), numberFormat.format(value));
         }
 
         NumberFormat currencyFormat = NumberFormat.getCurrencyInstance();
@@ -448,4 +452,58 @@ public class Utils {
         return loadImage(context.getCacheDir() + "/" + name);
     }
 
+    // https://stackoverflow.com/a/59324801/8378787
+    public static int getComplementaryColor(int color) {
+        int R = color & 255;
+        int G = (color >> 8) & 255;
+        int B = (color >> 16) & 255;
+        int A = (color >> 24) & 255;
+        R = 255 - R;
+        G = 255 - G;
+        B = 255 - B;
+        return R + (G << 8) + (B << 16) + (A << 24);
+    }
+
+    // replace colors in the current theme
+    public static void patchColors(AppCompatActivity activity) {
+        Settings settings = new Settings(activity);
+        String color = settings.getColor();
+
+        Resources.Theme theme = activity.getTheme();
+        Resources resources = activity.getResources();
+        if (color.equals(resources.getString(R.string.settings_key_pink_theme))) {
+            theme.applyStyle(R.style.pink, true);
+        } else if (color.equals(resources.getString(R.string.settings_key_magenta_theme))) {
+            theme.applyStyle(R.style.magenta, true);
+        } else if (color.equals(resources.getString(R.string.settings_key_violet_theme))) {
+            theme.applyStyle(R.style.violet, true);
+        } else if (color.equals(resources.getString(R.string.settings_key_blue_theme))) {
+            theme.applyStyle(R.style.blue, true);
+        } else if (color.equals(resources.getString(R.string.settings_key_sky_blue_theme))) {
+            theme.applyStyle(R.style.skyblue, true);
+        } else if (color.equals(resources.getString(R.string.settings_key_green_theme))) {
+            theme.applyStyle(R.style.green, true);
+        } else if (color.equals(resources.getString(R.string.settings_key_brown_theme))) {
+            theme.applyStyle(R.style.brown, true);
+        } else if (color.equals(resources.getString(R.string.settings_key_catima_theme))) {
+            // catima theme is AppTheme itself, no dynamic colors nor applyStyle
+        } else {
+            // final catch all in case of invalid theme value from older versions
+            // also handles R.string.settings_key_system_theme
+            DynamicColors.applyIfAvailable(activity);
+        }
+
+        if (isDarkModeEnabled(activity) && settings.getOledDark()) {
+            theme.applyStyle(R.style.DarkBackground, true);
+        }
+    }
+
+    // XXX android 9 and below has issues with patched theme where the background becomes a
+    // rendering mess
+    // use after views are inflated
+    public static void postPatchColors(AppCompatActivity activity) {
+        TypedValue typedValue = new TypedValue();
+        activity.getTheme().resolveAttribute(android.R.attr.colorBackground, typedValue, true);
+        activity.findViewById(android.R.id.content).setBackgroundColor(typedValue.data);
+    }
 }

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

@@ -1,7 +1,23 @@
 package protect.card_locker.importexport;
 
-public enum ImportExportResult {
-    Success,
-    GenericFailure,
-    BadPassword;
+public class ImportExportResult {
+    private ImportExportResultType resultType;
+    private String developerDetails;
+
+    public ImportExportResult(ImportExportResultType resultType) {
+        this(resultType, null);
+    }
+
+    public ImportExportResult(ImportExportResultType resultType, String developerDetails) {
+        this.resultType = resultType;
+        this.developerDetails = developerDetails;
+    }
+
+    public ImportExportResultType resultType() {
+        return resultType;
+    }
+
+    public String developerDetails() {
+        return developerDetails;
+    }
 }

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

@@ -0,0 +1,7 @@
+package protect.card_locker.importexport;
+
+public enum ImportExportResultType {
+    Success,
+    GenericFailure,
+    BadPassword;
+}

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

@@ -32,20 +32,20 @@ public class MultiFormatExporter {
                 break;
         }
 
+        String error;
         if (exporter != null) {
             try {
                 exporter.exportData(context, database, output, password);
-                return ImportExportResult.Success;
-            } catch (IOException e) {
-                Log.e(TAG, "Failed to export data", e);
-            } catch (InterruptedException e) {
+                return new ImportExportResult(ImportExportResultType.Success);
+            } catch (Exception e) {
                 Log.e(TAG, "Failed to export data", e);
+                error = e.toString();
             }
-
-            return ImportExportResult.GenericFailure;
         } else {
-            Log.e(TAG, "Unsupported data format exported: " + format.name());
-            return ImportExportResult.GenericFailure;
+            error = "Unsupported data format exported: " + format.name();
+            Log.e(TAG, error);
         }
+
+        return new ImportExportResult(ImportExportResultType.GenericFailure, error);
     }
 }

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

@@ -46,23 +46,26 @@ public class MultiFormatImporter {
                 break;
         }
 
+        String error = null;
         if (importer != null) {
             database.beginTransaction();
             try {
                 importer.importData(context, database, input, password);
                 database.setTransactionSuccessful();
-                return ImportExportResult.Success;
+                return new ImportExportResult(ImportExportResultType.Success);
             } catch (ZipException e) {
-                return ImportExportResult.BadPassword;
+                return new ImportExportResult(ImportExportResultType.BadPassword);
             } catch (IOException | FormatException | InterruptedException | JSONException | ParseException | NullPointerException e) {
                 Log.e(TAG, "Failed to import data", e);
+                error = e.toString();
             } finally {
                 database.endTransaction();
             }
         } else {
-            Log.e(TAG, "Unsupported data format imported: " + format.name());
+            error = "Unsupported data format imported: " + format.name();
+            Log.e(TAG, error);
         }
 
-        return ImportExportResult.GenericFailure;
+        return new ImportExportResult(ImportExportResultType.GenericFailure, error);
     }
 }

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

@@ -9,6 +9,7 @@ import androidx.annotation.IntegerRes;
 import androidx.annotation.StringRes;
 import androidx.appcompat.app.AppCompatDelegate;
 import androidx.preference.PreferenceManager;
+
 import protect.card_locker.R;
 import protect.card_locker.Utils;
 
@@ -102,4 +103,12 @@ public class Settings {
     public boolean getDisableLockscreenWhileViewingCard() {
         return getBoolean(R.string.settings_key_disable_lockscreen_while_viewing_card, true);
     }
+
+    public boolean getOledDark() {
+        return getBoolean(R.string.settings_key_oled_dark, false);
+    }
+
+    public String getColor() {
+        return getString(R.string.setting_key_theme_color, mContext.getResources().getString(R.string.settings_key_system_theme));
+    }
 }

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

@@ -18,6 +18,9 @@ import androidx.fragment.app.DialogFragment;
 import androidx.preference.ListPreference;
 import androidx.preference.Preference;
 import androidx.preference.PreferenceFragmentCompat;
+
+import com.google.android.material.color.DynamicColors;
+
 import nl.invissvenska.numberpickerpreference.NumberDialogPreference;
 import nl.invissvenska.numberpickerpreference.NumberPickerPreferenceDialogFragment;
 import protect.card_locker.CatimaAppCompatActivity;
@@ -128,16 +131,28 @@ public class SettingsActivity extends CatimaAppCompatActivity {
                 return true;
             });
 
-            Preference colorPreference = findPreference(getResources().getString(R.string.setting_key_theme_color));
+            localePreference.setOnPreferenceChangeListener((preference, newValue) -> {
+                refreshActivity(true);
+                return true;
+            });
+
+            Preference oledDarkPreference = findPreference(getResources().getString(R.string.settings_key_oled_dark));
+            assert oledDarkPreference != null;
+            oledDarkPreference.setOnPreferenceChangeListener((preference, newValue) -> {
+                refreshActivity(true);
+                return true;
+            });
+
+            ListPreference colorPreference = findPreference(getResources().getString(R.string.setting_key_theme_color));
             assert colorPreference != null;
             colorPreference.setOnPreferenceChangeListener((preference, o) -> {
                 refreshActivity(true);
                 return true;
             });
-            localePreference.setOnPreferenceChangeListener((preference, newValue) -> {
-                refreshActivity(true);
-                return true;
-            });
+            if (!DynamicColors.isDynamicColorAvailable()) {
+                colorPreference.setEntryValues(R.array.color_values_no_dynamic);
+                colorPreference.setEntries(R.array.color_value_strings_no_dynamic);
+            }
         }
 
         private void refreshActivity(boolean reloadMain) {

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

@@ -1,4 +1,4 @@
-<vector android:height="24dp" android:tint="#FFFFFF"
+<vector android:height="24dp" android:tint="?attr/colorControlNormal"
     android:viewportHeight="24" android:viewportWidth="24"
     android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
     <path android:fillColor="@android:color/white" android:pathData="M19,13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z"/>

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

@@ -1,4 +1,4 @@
-<vector android:height="24dp" android:tint="#FFFFFF"
+<vector android:height="24dp" android:tint="?attr/colorControlNormal"
     android:viewportHeight="24" android:viewportWidth="24"
     android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
     <path android:fillColor="@android:color/white" android:pathData="M20,11H7.83l5.59,-5.59L12,4l-8,8 8,8 1.41,-1.41L7.83,13H20v-2z"/>

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

@@ -1,4 +1,4 @@
-<vector android:height="24dp" android:tint="#FFFFFF"
+<vector android:height="24dp" android:tint="?attr/colorControlNormal"
     android:viewportHeight="24" android:viewportWidth="24"
     android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
     <path android:fillColor="@android:color/white" android:pathData="M7,10l5,5 5,-5z"/>

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

@@ -1,4 +1,4 @@
-<vector android:height="24dp" android:tint="#FFFFFF"
+<vector android:height="24dp" android:tint="?attr/colorControlNormal"
     android:viewportHeight="24" android:viewportWidth="24"
     android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
     <path android:fillColor="@android:color/white" android:pathData="M7,14l5,-5 5,5z"/>

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

@@ -1,5 +1,5 @@
 <vector android:autoMirrored="true" android:height="24dp"
-    android:tint="#FFFFFF" android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal" android:viewportHeight="24"
     android:viewportWidth="24" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
     <path android:fillColor="@android:color/white" android:pathData="M3,18h6v-2L3,16v2zM3,6v2h18L21,6L3,6zM3,13h12v-2L3,11v2z"/>
 </vector>

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

@@ -1,4 +1,4 @@
-<vector android:height="24dp" android:tint="#FFFFFF"
+<vector android:height="24dp" android:tint="?attr/colorControlNormal"
     android:viewportHeight="24" android:viewportWidth="24"
     android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
     <path android:fillColor="@android:color/white" android:pathData="M7.41,18.59L8.83,20 12,16.83 15.17,20l1.41,-1.41L12,14l-4.59,4.59zM16.59,5.41L15.17,4 12,7.17 8.83,4 7.41,5.41 12,10l4.59,-4.59z"/>

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

@@ -1,4 +1,4 @@
-<vector android:height="24dp" android:tint="#FFFFFF"
+<vector android:height="24dp" android:tint="?attr/colorControlNormal"
     android:viewportHeight="24" android:viewportWidth="24"
     android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
     <path android:fillColor="@android:color/white" android:pathData="M12,5.83L15.17,9l1.41,-1.41L12,3 7.41,7.59 8.83,9 12,5.83zM12,18.17L8.83,15l-1.41,1.41L12,21l4.59,-4.59L15.17,15 12,18.17z"/>

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

@@ -2,7 +2,8 @@
     android:width="24dp"
     android:height="24dp"
     android:viewportWidth="24"
-    android:viewportHeight="24">
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
   <path
       android:fillColor="#FFFFFFFF"
       android:pathData="M16,1L4,1c-1.1,0 -2,0.9 -2,2v14h2L4,3h12L16,1zM19,5L8,5c-1.1,0 -2,0.9 -2,2v14c0,1.1 0.9,2 2,2h11c1.1,0 2,-0.9 2,-2L21,7c0,-1.1 -0.9,-2 -2,-2zM19,21L8,21L8,7h11v14z"/>

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

@@ -1,4 +1,4 @@
-<vector android:height="24dp" android:tint="#FFFFFF"
+<vector android:height="24dp" android:tint="?attr/colorControlNormal"
     android:viewportHeight="24" android:viewportWidth="24"
     android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
     <path android:fillColor="@android:color/white" android:pathData="M6,19c0,1.1 0.9,2 2,2h8c1.1,0 2,-0.9 2,-2V7H6v12zM19,4h-3.5l-1,-1h-5l-1,1H5v2h14V4z"/>

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

@@ -1,9 +1,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
-    android:tint="@color/colorPrimary"
     android:viewportWidth="24"
-    android:viewportHeight="24">
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
   <path
       android:fillColor="#FFFFFF"
       android:pathData="M9,16.2L4.8,12l-1.4,1.4L9,19 21,7l-1.4,-1.4L9,16.2z"/>

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

@@ -2,7 +2,8 @@
     android:width="24dp"
     android:height="24dp"
     android:viewportWidth="24"
-    android:viewportHeight="24">
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
   <path
       android:pathData="M18,5l0,-3l-12,0l0,1.17l1.83,1.83z"
       android:fillColor="#FFFFFF"/>

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

@@ -2,7 +2,8 @@
     android:width="24dp"
     android:height="24dp"
     android:viewportWidth="24"
-    android:viewportHeight="24">
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
   <path
       android:pathData="M6,2h12v3h-12z"
       android:fillColor="#FFFFFF"/>

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

@@ -1,4 +1,4 @@
-<vector android:height="24dp" android:tint="#FFFFFF"
+<vector android:height="24dp" android:tint="?attr/colorControlNormal"
     android:viewportHeight="24" android:viewportWidth="24"
     android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
     <path android:fillColor="@android:color/white" android:pathData="M10,4H4c-1.1,0 -1.99,0.9 -1.99,2L2,18c0,1.1 0.9,2 2,2h16c1.1,0 2,-0.9 2,-2V8c0,-1.1 -0.9,-2 -2,-2h-8l-2,-2z"/>

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

@@ -1,4 +1,4 @@
-<vector android:height="24dp" android:tint="#FFFFFF"
+<vector android:height="24dp" android:tint="?attr/colorControlNormal"
     android:viewportHeight="24" android:viewportWidth="24"
     android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
     <path android:fillColor="@android:color/white" android:pathData="M9,3L5,6.99h3L8,14h2L10,6.99h3L9,3zM16,17.01L16,10h-2v7.01h-3L15,21l4,-3.99h-3z"/>

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

@@ -1,4 +1,4 @@
-<vector android:height="24dp" android:tint="#FFFFFF"
+<vector android:height="24dp" android:tint="?attr/colorControlNormal"
     android:viewportHeight="24" android:viewportWidth="24"
     android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
     <path android:fillColor="@android:color/white" android:pathData="M12,17c1.1,0 2,-0.9 2,-2s-0.9,-2 -2,-2 -2,0.9 -2,2 0.9,2 2,2zM18,8h-1L17,6c0,-2.76 -2.24,-5 -5,-5S7,3.24 7,6h1.9c0,-1.71 1.39,-3.1 3.1,-3.1 1.71,0 3.1,1.39 3.1,3.1v2L6,8c-1.1,0 -2,0.9 -2,2v10c0,1.1 0.9,2 2,2h12c1.1,0 2,-0.9 2,-2L20,10c0,-1.1 -0.9,-2 -2,-2zM18,20L6,20L6,10h12v10z"/>

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

@@ -1,4 +1,4 @@
-<vector android:height="24dp" android:tint="#FFFFFF"
+<vector android:height="24dp" android:tint="?attr/colorControlNormal"
     android:viewportHeight="24" android:viewportWidth="24"
     android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
     <path android:fillColor="@android:color/white" android:pathData="M18,8h-1L17,6c0,-2.76 -2.24,-5 -5,-5S7,3.24 7,6v2L6,8c-1.1,0 -2,0.9 -2,2v10c0,1.1 0.9,2 2,2h12c1.1,0 2,-0.9 2,-2L20,10c0,-1.1 -0.9,-2 -2,-2zM12,17c-1.1,0 -2,-0.9 -2,-2s0.9,-2 2,-2 2,0.9 2,2 -0.9,2 -2,2zM15.1,8L8.9,8L8.9,6c0,-1.71 1.39,-3.1 3.1,-3.1 1.71,0 3.1,1.39 3.1,3.1v2z"/>

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

@@ -1,4 +1,4 @@
-<vector android:height="24dp" android:tint="#FFFFFF"
+<vector android:height="24dp" android:tint="?attr/colorControlNormal"
     android:viewportHeight="24" android:viewportWidth="24"
     android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
     <path android:fillColor="@android:color/white" android:pathData="M3,17.25V21h3.75L17.81,9.94l-3.75,-3.75L3,17.25zM20.71,7.04c0.39,-0.39 0.39,-1.02 0,-1.41l-2.34,-2.34c-0.39,-0.39 -1.02,-0.39 -1.41,0l-1.83,1.83 3.75,3.75 1.83,-1.83z"/>

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

@@ -1,4 +1,4 @@
-<vector android:height="24dp" android:tint="#FFFFFF"
+<vector android:height="24dp" android:tint="?attr/colorControlNormal"
     android:viewportHeight="24" android:viewportWidth="24"
     android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
     <path android:fillColor="@android:color/white" android:pathData="M15.5,14h-0.79l-0.28,-0.27C15.41,12.59 16,11.11 16,9.5 16,5.91 13.09,3 9.5,3S3,5.91 3,9.5 5.91,16 9.5,16c1.61,0 3.09,-0.59 4.23,-1.57l0.27,0.28v0.79l5,4.99L20.49,19l-4.99,-5zM9.5,14C7.01,14 5,11.99 5,9.5S7.01,5 9.5,5 14,7.01 14,9.5 11.99,14 9.5,14z"/>

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

@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:drawable="@color/listItemHighlight" android:state_activated="true" />
-</selector>

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

@@ -1,4 +1,4 @@
-<vector android:height="24dp" android:tint="#FFFFFF"
+<vector android:height="24dp" android:tint="?attr/colorControlNormal"
     android:viewportHeight="24" android:viewportWidth="24"
     android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
     <path android:fillColor="@android:color/white" android:pathData="M17,3L5,3c-1.11,0 -2,0.9 -2,2v14c0,1.1 0.89,2 2,2h14c1.1,0 2,-0.9 2,-2L21,7l-4,-4zM12,19c-1.66,0 -3,-1.34 -3,-3s1.34,-3 3,-3 3,1.34 3,3 -1.34,3 -3,3zM15,9L5,9L5,5h10v4z"/>

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

@@ -10,15 +10,13 @@
 
     <com.google.android.material.appbar.AppBarLayout
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:theme="@style/AppTheme.AppBarOverlay">
+        android:layout_height="wrap_content">
 
-        <androidx.appcompat.widget.Toolbar
+        <com.google.android.material.appbar.MaterialToolbar
             android:id="@+id/toolbar"
             android:layout_width="match_parent"
             android:layout_height="?attr/actionBarSize"
-            android:background="?attr/colorPrimary"
-            app:popupTheme="@style/AppTheme.PopupOverlay"/>
+            style="?attr/toolbarStyle" />
 
     </com.google.android.material.appbar.AppBarLayout>
 
@@ -46,7 +44,6 @@
                     android:fontFamily="sans-serif-medium"
                     android:padding="2dp"
                     android:text="@string/version_history"
-                    android:textColor="@color/colorSecondaryText"
                     android:textSize="18sp"
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toTopOf="parent" />
@@ -67,7 +64,6 @@
                     android:layout_margin="8dp"
                     android:fontFamily="sans-serif-medium"
                     android:text="@string/arrow"
-                    android:textColor="@color/colorSecondaryText"
                     android:textSize="20sp"
                     app:layout_constraintBottom_toBottomOf="parent"
                     app:layout_constraintEnd_toEndOf="parent"
@@ -87,7 +83,6 @@
                     android:fontFamily="sans-serif-medium"
                     android:padding="2dp"
                     android:text="@string/credits"
-                    android:textColor="@color/colorSecondaryText"
                     android:textSize="18sp"
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toTopOf="parent" />
@@ -108,7 +103,6 @@
                     android:layout_margin="8dp"
                     android:fontFamily="sans-serif-medium"
                     android:text="@string/arrow"
-                    android:textColor="@color/colorSecondaryText"
                     android:textSize="20sp"
                     app:layout_constraintBottom_toBottomOf="parent"
                     app:layout_constraintEnd_toEndOf="parent"
@@ -128,7 +122,6 @@
                     android:fontFamily="sans-serif-medium"
                     android:padding="2dp"
                     android:text="@string/help_translate_this_app"
-                    android:textColor="@color/colorSecondaryText"
                     android:textSize="18sp"
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toTopOf="parent" />
@@ -151,7 +144,6 @@
                     android:layout_margin="8dp"
                     android:fontFamily="sans-serif-medium"
                     android:text="@string/arrow"
-                    android:textColor="@color/colorSecondaryText"
                     android:textSize="20sp"
                     app:layout_constraintBottom_toBottomOf="parent"
                     app:layout_constraintEnd_toEndOf="parent"
@@ -171,7 +163,6 @@
                     android:fontFamily="sans-serif-medium"
                     android:padding="2dp"
                     android:text="@string/license"
-                    android:textColor="@color/colorSecondaryText"
                     android:textSize="18sp"
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toTopOf="parent" />
@@ -194,7 +185,6 @@
                     android:layout_margin="8dp"
                     android:fontFamily="sans-serif-medium"
                     android:text="@string/arrow"
-                    android:textColor="@color/colorSecondaryText"
                     android:textSize="20sp"
                     app:layout_constraintBottom_toBottomOf="parent"
                     app:layout_constraintEnd_toEndOf="parent"
@@ -214,7 +204,6 @@
                     android:fontFamily="sans-serif-medium"
                     android:padding="2dp"
                     android:text="@string/source_repository"
-                    android:textColor="@color/colorSecondaryText"
                     android:textSize="18sp"
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toTopOf="parent" />
@@ -236,7 +225,6 @@
                     android:layout_margin="8dp"
                     android:fontFamily="sans-serif-medium"
                     android:text="@string/arrow"
-                    android:textColor="@color/colorSecondaryText"
                     android:textSize="20sp"
                     app:layout_constraintBottom_toBottomOf="parent"
                     app:layout_constraintEnd_toEndOf="parent"
@@ -256,7 +244,6 @@
                     android:fontFamily="sans-serif-medium"
                     android:padding="2dp"
                     android:text="@string/privacy_policy"
-                    android:textColor="@color/colorSecondaryText"
                     android:textSize="18sp"
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toTopOf="parent" />
@@ -278,7 +265,6 @@
                     android:layout_margin="8dp"
                     android:fontFamily="sans-serif-medium"
                     android:text="@string/arrow"
-                    android:textColor="@color/colorSecondaryText"
                     android:textSize="20sp"
                     app:layout_constraintBottom_toBottomOf="parent"
                     app:layout_constraintEnd_toEndOf="parent"
@@ -298,7 +284,6 @@
                     android:fontFamily="sans-serif-medium"
                     android:padding="2dp"
                     android:text="@string/rate_this_app"
-                    android:textColor="@color/colorSecondaryText"
                     android:textSize="18sp"
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toTopOf="parent" />
@@ -320,7 +305,6 @@
                     android:layout_margin="8dp"
                     android:fontFamily="sans-serif-medium"
                     android:text="@string/arrow"
-                    android:textColor="@color/colorSecondaryText"
                     android:textSize="20sp"
                     app:layout_constraintBottom_toBottomOf="parent"
                     app:layout_constraintEnd_toEndOf="parent"
@@ -340,7 +324,6 @@
                     android:fontFamily="sans-serif-medium"
                     android:padding="2dp"
                     android:text="@string/report_error"
-                    android:textColor="@color/colorSecondaryText"
                     android:textSize="18sp"
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toTopOf="parent" />
@@ -362,7 +345,6 @@
                     android:layout_margin="8dp"
                     android:fontFamily="sans-serif-medium"
                     android:text="@string/arrow"
-                    android:textColor="@color/colorSecondaryText"
                     android:textSize="20sp"
                     app:layout_constraintBottom_toBottomOf="parent"
                     app:layout_constraintEnd_toEndOf="parent"

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

@@ -22,15 +22,13 @@
 
         <com.google.android.material.appbar.AppBarLayout
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:theme="@style/AppTheme.AppBarOverlay">
+            android:layout_height="wrap_content">
 
-            <androidx.appcompat.widget.Toolbar
+            <com.google.android.material.appbar.MaterialToolbar
                 android:id="@+id/toolbar"
                 android:layout_width="match_parent"
                 android:layout_height="?attr/actionBarSize"
-                android:background="?attr/colorPrimary"
-                app:popupTheme="@style/AppTheme.PopupOverlay" />
+                style="?attr/toolbarStyle" />
 
             <com.google.android.material.tabs.TabLayout
                 android:id="@+id/groups"

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

@@ -8,14 +8,13 @@
 
     <com.google.android.material.appbar.AppBarLayout
         android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:theme="@style/AppTheme.AppBarOverlay">
-        <androidx.appcompat.widget.Toolbar
+        android:layout_height="wrap_content">
+
+        <com.google.android.material.appbar.MaterialToolbar
             android:id="@+id/toolbar"
             android:layout_width="match_parent"
             android:layout_height="?attr/actionBarSize"
-            android:background="?attr/colorPrimary"
-            app:popupTheme="@style/AppTheme.PopupOverlay" />
+            style="?attr/toolbarStyle" />
     </com.google.android.material.appbar.AppBarLayout>
 
     <LinearLayout

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

@@ -42,8 +42,9 @@
         app:spanCount="@integer/main_view_card_columns"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
+        android:paddingBottom="80dp"
+        android:clipToPadding="false"
         android:scrollbars="vertical"
-        android:background="@color/mainLoyaltyCardBackground"
         android:visibility="gone"/>
 
 </RelativeLayout>

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

@@ -43,8 +43,7 @@
             android:layout_height="@dimen/cardThumbnailSize"
             android:layout_weight="1"
             app:srcCompat="@drawable/ic_baseline_arrow_drop_up_24"
-            android:contentDescription="@string/moveUp"
-            app:tint="@color/iconColor"/>
+            android:contentDescription="@string/moveUp"/>
 
         <ImageButton
             android:id="@+id/moveDown"
@@ -52,8 +51,7 @@
             android:layout_height="@dimen/cardThumbnailSize"
             android:layout_weight="1"
             app:srcCompat="@drawable/ic_baseline_arrow_drop_down_24"
-            android:contentDescription="@string/moveDown"
-            app:tint="@color/iconColor"/>
+            android:contentDescription="@string/moveDown"/>
 
         <ImageButton
             android:id="@+id/edit"
@@ -61,8 +59,7 @@
             android:layout_height="@dimen/cardThumbnailSize"
             android:layout_weight="1"
             app:srcCompat="@drawable/ic_mode_edit_white_24dp"
-            android:contentDescription="@string/edit"
-            app:tint="@color/iconColor"/>
+            android:contentDescription="@string/edit"/>
 
         <ImageButton
             android:id="@+id/delete"
@@ -70,8 +67,7 @@
             android:layout_height="@dimen/cardThumbnailSize"
             android:layout_weight="1"
             app:srcCompat="@drawable/ic_delete_white_24dp"
-            android:contentDescription="@string/delete"
-            app:tint="@color/iconColor"/>
+            android:contentDescription="@string/delete"/>
 
     </LinearLayout>
 

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

@@ -21,6 +21,8 @@
         android:id="@+id/list"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
+        android:paddingBottom="80dp"
+        android:clipToPadding="false"
         android:scrollbars="vertical"
         android:visibility="gone" />
 </RelativeLayout>

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

@@ -7,15 +7,13 @@
 
     <com.google.android.material.appbar.AppBarLayout
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:theme="@style/AppTheme.AppBarOverlay">
+        android:layout_height="wrap_content">
 
-        <androidx.appcompat.widget.Toolbar
+        <com.google.android.material.appbar.MaterialToolbar
             android:id="@+id/toolbar"
             android:layout_width="match_parent"
             android:layout_height="?attr/actionBarSize"
-            android:background="?attr/colorPrimary"
-            app:popupTheme="@style/AppTheme.PopupOverlay" />
+            style="?attr/toolbarStyle" />
 
     </com.google.android.material.appbar.AppBarLayout>
 

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

@@ -4,6 +4,6 @@
     android:layout_height="wrap_content"
     android:paddingLeft="8dp"
     android:paddingRight="8dp"
-    style="@style/Widget.MaterialComponents.Chip.Choice"
+    style="@style/Widget.MaterialComponents.Chip.Filter"
     app:checkedIconVisible="true"
-    android:textAppearance="?android:attr/textAppearance" />
+    android:textAppearance="?android:attr/textAppearance" />

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

@@ -18,15 +18,13 @@
 
     <com.google.android.material.appbar.AppBarLayout
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:theme="@style/AppTheme.AppBarOverlay">
+        android:layout_height="wrap_content">
 
-        <androidx.appcompat.widget.Toolbar
+        <com.google.android.material.appbar.MaterialToolbar
             android:id="@+id/toolbar"
             android:layout_width="match_parent"
             android:layout_height="?attr/actionBarSize"
-            android:background="?attr/colorPrimary"
-            app:popupTheme="@style/AppTheme.PopupOverlay" />
+            style="?attr/toolbarStyle" />
 
         <com.google.android.material.tabs.TabLayout
             android:id="@+id/tabs"
@@ -50,7 +48,6 @@
 
     <ScrollView android:layout_width="fill_parent"
                 android:layout_height="wrap_content"
-                android:background="@color/inputContrastBackground"
                 app:layout_behavior="com.google.android.material.appbar.AppBarLayout$ScrollingViewBehavior">
         <TableLayout
             android:layout_width="match_parent"
@@ -209,7 +206,6 @@
                         android:layout_width="0dp"
                         android:layout_height="wrap_content"
                         android:text="@string/editBarcode"
-                        android:textColor="#FFFFFF"
                         android:layout_weight="1.0"/>
                 </LinearLayout>
             </TableLayout>
@@ -366,7 +362,8 @@
                             android:minHeight="50dp"
                             android:contentDescription="@string/frontImageDescription"
                             android:scaleType="fitCenter"
-                            app:srcCompat="@drawable/ic_camera_white" />
+                            app:srcCompat="@drawable/ic_camera_white"
+                            android:background="?attr/colorPrimary" />
 
                     </com.google.android.material.card.MaterialCardView>
                 </LinearLayout>
@@ -401,7 +398,8 @@
                             android:minHeight="50dp"
                             android:contentDescription="@string/backImageDescription"
                             android:scaleType="fitCenter"
-                            app:srcCompat="@drawable/ic_camera_white" />
+                            app:srcCompat="@drawable/ic_camera_white"
+                            android:background="?attr/colorPrimary" />
 
                     </com.google.android.material.card.MaterialCardView>
                 </LinearLayout>

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

@@ -18,6 +18,7 @@
             android:layout_height="0dp"
             android:outlineProvider="none"
             app:cardCornerRadius="8dp"
+            app:strokeWidth="0dp"
             app:layout_constraintBottom_toTopOf="@+id/store"
             app:layout_constraintDimensionRatio="85.6f:53.98f"
             app:layout_constraintTop_toTopOf="parent">

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

@@ -55,11 +55,12 @@
                 android:padding="0dp"
                 app:srcCompat="@drawable/ic_baseline_arrow_drop_up_24"
                 android:contentDescription="@string/moveBarcodeToTopOfScreen"
-                app:tint="#ffffff"
+                app:tint="?attr/colorOnPrimary"
                 app:layout_constraintTop_toTopOf="parent"
                 app:layout_constraintBottom_toTopOf="@+id/mainImage"
                 app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toStartOf="parent" />
+                app:layout_constraintStart_toStartOf="parent"
+                android:background="?attr/colorPrimary" />
 
             <ImageView
                 android:id="@+id/mainImage"
@@ -86,10 +87,11 @@
                 android:padding="0dp"
                 app:srcCompat="@drawable/ic_baseline_arrow_drop_down_24"
                 android:contentDescription="@string/moveBarcodeToCenterOfScreen"
-                app:tint="#ffffff"
+                app:tint="?attr/colorOnPrimary"
                 app:layout_constraintTop_toBottomOf="@+id/mainImage"
                 app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toStartOf="parent" />
+                app:layout_constraintStart_toStartOf="parent"
+                android:background="?attr/colorPrimary" />
 
             <LinearLayout
                 android:id="@+id/dotIndicator"
@@ -156,7 +158,7 @@
         android:id="@+id/bottom_sheet"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:background="@color/inputBackground"
+        android:background="?android:colorBackground"
         android:orientation="vertical"
         android:paddingTop="0px"
         android:visibility="gone"
@@ -173,7 +175,8 @@
             android:contentDescription="@string/showMoreInfo"
             android:scaleType="fitCenter"
             app:srcCompat="@drawable/ic_baseline_arrow_drop_up_24"
-            app:tint="#ffffff" />
+            app:tint="?attr/colorOnPrimary"
+            android:background="?attr/colorPrimary" />
 
         <androidx.core.widget.NestedScrollView
             android:id="@+id/bottomSheetContentWrapper"
@@ -249,14 +252,13 @@
         android:weightSum="1.0"
         >
 
-        <androidx.appcompat.widget.Toolbar
+        <com.google.android.material.appbar.MaterialToolbar
             android:id="@+id/toolbar_landscape"
             android:layout_width="fill_parent"
             android:layout_height="?actionBarSize"
             android:background="@android:color/transparent"
             android:fitsSystemWindows="false"
             android:paddingTop="0dp"
-            android:theme="@style/CardView.ActionBarTheme"
             android:visibility="gone"
             app:contentInsetStart="72.0dip"
             app:layout_collapseMode="pin" />
@@ -292,7 +294,6 @@
                 android:layout_width="fill_parent"
                 android:layout_height="?actionBarSize"
                 android:background="@android:color/transparent"
-                android:theme="@style/CardView.ActionBarTheme"
                 app:contentInsetStart="72.0dip"
                 app:layout_collapseMode="pin" />
 

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

@@ -19,15 +19,13 @@
 
     <com.google.android.material.appbar.AppBarLayout
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:theme="@style/AppTheme.AppBarOverlay">
+        android:layout_height="wrap_content">
 
-        <androidx.appcompat.widget.Toolbar
+        <com.google.android.material.appbar.MaterialToolbar
             android:id="@+id/toolbar"
             android:layout_width="match_parent"
             android:layout_height="?attr/actionBarSize"
-            android:background="?attr/colorPrimary"
-            app:popupTheme="@style/AppTheme.PopupOverlay"/>
+            style="?attr/toolbarStyle" />
 
         <com.google.android.material.tabs.TabLayout
             android:id="@+id/groups"

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

@@ -19,15 +19,13 @@
 
     <com.google.android.material.appbar.AppBarLayout
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:theme="@style/AppTheme.AppBarOverlay">
+        android:layout_height="wrap_content">
 
-        <androidx.appcompat.widget.Toolbar
+        <com.google.android.material.appbar.MaterialToolbar
             android:id="@+id/toolbar"
             android:layout_width="match_parent"
             android:layout_height="?attr/actionBarSize"
-            android:background="?attr/colorPrimary"
-            app:popupTheme="@style/AppTheme.PopupOverlay"/>
+            style="?attr/toolbarStyle" />
 
     </com.google.android.material.appbar.AppBarLayout>
 

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

@@ -9,15 +9,13 @@
 
     <com.google.android.material.appbar.AppBarLayout
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:theme="@style/AppTheme.AppBarOverlay">
+        android:layout_height="wrap_content">
 
-        <androidx.appcompat.widget.Toolbar
+        <com.google.android.material.appbar.MaterialToolbar
             android:id="@+id/toolbar"
             android:layout_width="match_parent"
             android:layout_height="?attr/actionBarSize"
-            android:background="?attr/colorPrimary"
-            app:popupTheme="@style/AppTheme.PopupOverlay" />
+            style="?attr/toolbarStyle" />
 
     </com.google.android.material.appbar.AppBarLayout>
 
@@ -25,6 +23,7 @@
         android:id="@+id/zxing_barcode_scanner"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
+        android:layout_marginTop="?attr/actionBarSize"
         app:zxing_scanner_layout="@layout/custom_barcode_scanner">
     </com.journeyapps.barcodescanner.DecoratedBarcodeView>
-</RelativeLayout>
+</RelativeLayout>

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

@@ -1,27 +1,28 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:orientation="vertical">
+    android:fitsSystemWindows="true"
+    tools:context="protect.card_locker.preferences.SettingsActivity">
 
     <com.google.android.material.appbar.AppBarLayout
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:theme="@style/AppTheme.AppBarOverlay">
+        android:layout_height="wrap_content">
 
-        <androidx.appcompat.widget.Toolbar
+        <com.google.android.material.appbar.MaterialToolbar
             android:id="@+id/toolbar"
+            style="?attr/toolbarStyle"
             android:layout_width="match_parent"
-            android:layout_height="?attr/actionBarSize"
-            android:background="?attr/colorPrimary"
-            app:popupTheme="@style/AppTheme.PopupOverlay"/>
+            android:layout_height="?attr/actionBarSize" />
 
     </com.google.android.material.appbar.AppBarLayout>
 
     <androidx.fragment.app.FragmentContainerView
         android:id="@+id/settings_container"
         android:layout_width="match_parent"
-        android:layout_height="match_parent" />
+        android:layout_height="match_parent"
+        android:layout_marginTop="?attr/actionBarSize" />
 
-</LinearLayout>
+</androidx.coordinatorlayout.widget.CoordinatorLayout>

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

@@ -7,15 +7,13 @@
 
     <com.google.android.material.appbar.AppBarLayout
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:theme="@style/AppTheme.AppBarOverlay">
+        android:layout_height="wrap_content">
 
-        <androidx.appcompat.widget.Toolbar
+        <com.google.android.material.appbar.MaterialToolbar
             android:id="@+id/toolbar"
             android:layout_width="match_parent"
             android:layout_height="?attr/actionBarSize"
-            android:background="?attr/colorPrimary"
-            app:popupTheme="@style/AppTheme.PopupOverlay"/>
+            style="?attr/toolbarStyle" />
 
     </com.google.android.material.appbar.AppBarLayout>
 

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

@@ -7,22 +7,25 @@
         android:title="@string/action_search"
         android:icon="@drawable/ic_search_white"
         app:actionViewClass="androidx.appcompat.widget.SearchView"
-        app:showAsAction="always|collapseActionView"/>
+        app:showAsAction="always|collapseActionView"
+        android:visible="false"/>
     <item
         android:id="@+id/action_unfold"
         android:title="@string/action_hide_details"
         android:icon="@drawable/ic_baseline_unfold_less_24"
-        app:showAsAction="always"/>
+        app:showAsAction="always"
+        android:visible="false"/>
     <item
         android:id="@+id/action_sort"
         android:title="@string/sort"
         android:icon="@drawable/ic_baseline_sort_24"
-        app:showAsAction="always"/>
+        app:showAsAction="always"
+        android:visible="false"/>
     <item
         android:id="@+id/action_manage_groups"
         android:icon="@drawable/ic_folder_white"
         android:title="@string/groups"
-        app:showAsAction="ifRoom"/>
+        app:showAsAction="never"/>
     <item
         android:id="@+id/action_import_export"
         android:icon="@drawable/ic_import_export_white_24dp"

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

@@ -8,32 +8,35 @@ mondstern
 Katharine Chui
 Oğuz Ersen
 IllusiveMan196
-Petr Novák
-Taco
-Joel A
-Gediminas Murauskas
 Altonss
+Petr Novák
+Joel A
+Taco
+Gediminas Murauskas
 StoyanDimitrov
 Nyatsuki
+Michael Moroni
 Samantaz Fox
 arno-github
 Ankit Tiwari
 Sergio Paredes
-Michael Moroni
 laralem
 arshbeerSingh
 huuhaa
 Miha Frangež
 sr093906
+mdvhimself
+Maciej Błędkowski
 Olivia (Zoe)
+Quentin PAGÈS
 betsythefc
 waffshappen
+ati3
 K. Herbert
-Maciej Błędkowski
-Quentin PAGÈS
 String E. Fighter
 Yurical
 Silvério Santos
+rr-vesp
 /usr/local/ΕΨΗΕΛΩΝ
 Adolfo Jayme-Barrientos
 Alessandro Mandelli
@@ -57,7 +60,9 @@ Airat
 Andreas Blaser
 BMN
 Biren
+Mylou53
 Kasina Dheeraj
+Eric
 Flav
 Franciszek Stefan
 Izzy
@@ -69,6 +74,7 @@ Michael Gangolf
 pbeckmann
 Peer Beckmann
 Quang Nguyen
+Ratnesh
 Reza
 Rohan Babbar 
 Ronak Upadhyay
@@ -86,4 +92,3 @@ Robin
 sergio
 Marcus
 techwebpd
-rr-vesp

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

@@ -11,7 +11,7 @@
     <string name="unstar">Премахва от любими</string>
     <string name="star">Добавя към любими</string>
     <string name="noBarcode">Без щрихкод</string>
-    <string name="barcodeNoBarcode">Картата няма щрихкод</string>
+    <string name="barcodeNoBarcode">Липсва щрихкод</string>
     <string name="barcodeType">Вид на щрихкод</string>
     <string name="cardId">Идентификатор на карта</string>
     <string name="note">Бележка</string>
@@ -25,18 +25,18 @@
     </plurals>
     <string name="failedOpeningFileManager">Инсталирайте приложение за управление на файлове.</string>
     <string name="app_license">Свободен софтуер с авторски права, лицензиран под GPLv3+</string>
-    <string name="frontImageDescription">Снимка на предната страна на карта</string>
-    <string name="backImageDescription">Снимка на задната страна на карта</string>
+    <string name="frontImageDescription">Снимка на предната страна</string>
+    <string name="backImageDescription">Снимка на задната страна</string>
     <string name="parsingBalanceFailed"><xliff:g>%s</xliff:g> не изглежда истинска наличност.</string>
     <string name="no">Не</string>
     <string name="yes">Да</string>
     <string name="setBackImage">Снимка на задната страна</string>
     <string name="setFrontImage">Снимка на предната страна</string>
     <string name="photos">Снимки</string>
-    <string name="importOptionApplicationExplanation">Изберете файл чрез друго приложение.</string>
-    <string name="noExternalStoragePermissionError">Дайте разрешение за достъп до хранилището, за да работи внасянето и изнасянето</string>
+    <string name="importOptionApplicationExplanation">Изберете файл на друго приложение.</string>
+    <string name="noExternalStoragePermissionError">Разрешете достъп до хранилището, за да работи внасянето и изнасянето</string>
     <string name="noCardExistsError">Картата не е намерена</string>
-    <string name="updateBarcodeQuestionText">Идентификаторът е променен. Желаете ли с неговата стойност да бъде променен и щрихкода\?</string>
+    <string name="updateBarcodeQuestionText">Идентификаторът е променен. Желаете ли с неговата стойност да бъде променен и щрихкодът\?</string>
     <string name="updateBarcodeQuestionTitle">Обновяване на щрихкода\?</string>
     <string name="noCardIdError">Не е въведен идентификатор</string>
     <string name="noCardsMessage">Добавете карта</string>
@@ -80,7 +80,6 @@
     <string name="groupsList">Списъци: <xliff:g>%s</xliff:g></string>
     <string name="expiryStateSentence">Валидност: <xliff:g>%s</xliff:g></string>
     <string name="expiryStateSentenceExpired">Изтекла: <xliff:g>%s</xliff:g></string>
-    <string name="balancePoints"><xliff:g>%s</xliff:g> точки</string>
     <string name="balanceSentence">Наличност: <xliff:g>%s</xliff:g></string>
     <string name="noGroups">Докоснете бутона +, за да добавите списък.</string>
     <string name="noStoreError">Не е въведено наименование</string>
@@ -99,33 +98,33 @@
     <string name="settings_category_title_ui">Потребителски интерфейс</string>
     <string name="settings">Настройки</string>
     <string name="starImage">Звезда за любимо</string>
-    <string name="thumbnailDescription">Миниатюра на картата</string>
-    <string name="copy_to_clipboard_toast">Идентификаторът на картата е копиран в междинната памет</string>
-    <string name="enterBarcodeInstructions">Въведете идентификатор на картата или като изберете вида на щрихкода или докоснете бутона „Картата няма щрихкод“.</string>
+    <string name="thumbnailDescription">Миниатюра</string>
+    <string name="copy_to_clipboard_toast">Идентификаторът е копиран в междинната памет</string>
+    <string name="enterBarcodeInstructions">Въведете идентификатор и или изберете вида на щрихкода, или докоснете бутона „Липсва щрихкод“.</string>
     <string name="selectBarcodeTitle">Избиране на щрихкод</string>
     <string name="importOptionApplicationButton">Избиране чрез приложение</string>
     <string name="importing">Внасяне…</string>
     <string name="exporting">Изнасяне…</string>
-    <string name="exportFailed">Картите не могат да бъдат изнесени</string>
+    <string name="exportFailed">Данните не могат да бъдат изнесени</string>
     <string name="exportFailedTitle">Грешка при изнасяне</string>
-    <string name="importFailed">Картите не могат да бъдат внесени</string>
+    <string name="importFailed">Данните не могат да бъдат внесени</string>
     <string name="importFailedTitle">Грешка при внасяне</string>
     <string name="exportSuccessfulTitle">Резултат от изнасяне</string>
     <string name="importSuccessfulTitle">Резултат от внасяне</string>
-    <string name="importExportHelp">Резервните копия на картите ви дават възможност да ги преместите на друго устройство.</string>
+    <string name="importExportHelp">Резервните копия на данните ви дават възможност да ги премествате на друго устройство.</string>
     <string name="exportName">Изнасяне</string>
     <string name="importExport">Внасяне/изнасяне</string>
     <string name="sendLabel">Изпращане…</string>
-    <string name="scanCardBarcode">Снемане на щрихкод от карта</string>
+    <string name="scanCardBarcode">Снемане на щрихкод</string>
     <string name="editCardTitle">Редактиране на карта</string>
     <string name="share">Споделя</string>
     <string name="copy_to_clipboard">Копира идентификатора в междинната памет</string>
     <string name="ok">Добре</string>
-    <string name="importSuccessful">Картите са внесени успешно</string>
-    <string name="chooseImportType">От къде ще внесете\?</string>
+    <string name="importSuccessful">Данните са внесени</string>
+    <string name="chooseImportType">Внасяне на данни на</string>
     <string name="importCatimaMessage">Изберете файла <i>catima.zip</i>, предварително изнесен от Catima.
 \nСъздайте такъв файл от меню Внасяне/изнасяне от друго устройство с Catima като изберете Изнасяне.</string>
-    <string name="importOptionApplicationTitle">От друго приложение</string>
+    <string name="importOptionApplicationTitle">Чрез друго приложение</string>
     <string name="importOptionFilesystemButton">Избиране от файлова система</string>
     <string name="importOptionFilesystemExplanation">Изберете определен файл от файловата система.</string>
     <string name="app_resources">Свободни ресурси: <xliff:g id="app_resources_list">%s</xliff:g></string>
@@ -139,12 +138,12 @@
     <string name="about">Относно</string>
     <string name="importOptionFilesystemTitle">Внасяне от файловата система</string>
     <string name="importCatima">Внасяне от Catima</string>
-    <string name="exportSuccessful">Картите са изнесени успешно</string>
+    <string name="exportSuccessful">Данните са изнесени</string>
     <string name="unlockScreen">Разрешава автоматичното завъртане</string>
     <string name="lockScreen">Спира автоматичното завъртане</string>
     <plurals name="selectedCardCount">
-        <item quantity="one"><xliff:g>%d</xliff:g> избрана карта</item>
-        <item quantity="other"><xliff:g>%d</xliff:g> избрани карти</item>
+        <item quantity="one"><xliff:g>%d</xliff:g> избрана</item>
+        <item quantity="other"><xliff:g>%d</xliff:g> избрани</item>
     </plurals>
     <string name="deleteConfirmationGroup">Изтриване на група\?</string>
     <string name="moveDown">Преместване надолу</string>
@@ -162,14 +161,13 @@
     <string name="importLoyaltyCardKeychainMessage">Изберете файла <i>LoyaltyCardKeychain.csv</i>, предварително изнесен от Loyalty Card Keychain.
 \nСъздайте такъв файл от меню Внасяне/изнасяне от друго устройство с Loyalty Card Keychain като изберете Изнасяне.</string>
     <string name="failedParsingImportUriError">Препратката не може да бъде анализирана за внасяне</string>
-    <string name="card_ids_copied">[не превеждай този низ, https://github.com/TheLastProject/Catima/issues/278]</string>
     <string name="failedGeneratingShareURL">Грешка при създаване на адрес за споделяне. Изпратете доклад за дефект.</string>
     <string name="deleteTitle">Премахване на карта</string>
     <plurals name="deleteCardsTitle">
         <item quantity="one">Изтриване на <xliff:g>%d</xliff:g> карта</item>
         <item quantity="other">Изтриване на <xliff:g>%d</xliff:g> карти</item>
     </plurals>
-    <string name="deleteConfirmation">Потвърдете премахване на картата.</string>
+    <string name="deleteConfirmation">Потвърждавате ли премахване на картата\?</string>
     <plurals name="deleteCardsConfirmation">
         <item quantity="one">Желаете ли <xliff:g>%d</xliff:g> карта да бъде премахната\?</item>
         <item quantity="other">Желаете ли тези <xliff:g>%d</xliff:g> карти да бъдат премахнати\?</item>
@@ -187,11 +185,11 @@
     <string name="settings_theme_color">Цвят на темата</string>
     <string name="settings_system_locale">Система</string>
     <string name="settings_locale">Език</string>
-    <string name="noGroupCards">Групата не съдържа карти</string>
-    <string name="barcodeImageDescriptionWithType">Изображение на щрихкод на карта от вида <xliff:g>%s</xliff:g></string>
+    <string name="noGroupCards">Групата е празна</string>
+    <string name="barcodeImageDescriptionWithType">Изображение на щрихкод от вид <xliff:g>%s</xliff:g></string>
     <string name="swipeToSwitchImages">Плъзване или задържане за смяна на изображения</string>
     <string name="sort_by">Сортиране по</string>
-    <string name="reverse">Наобратно</string>
+    <string name="reverse">…в обратен ред</string>
     <string name="sort_by_balance">Наличност</string>
     <string name="sort_by_expiry">Валидност</string>
     <string name="sort_by_most_recently_used">Последно използване</string>
@@ -218,5 +216,18 @@
     <string name="group_edit">Редактиране на списък</string>
     <string name="action_show_details">Повече детайли</string>
     <string name="action_hide_details">По-малко детайли</string>
-    <string name="noGiftCardsGroup">Няма карти. След като добавите ще можете да ги зачислите към списък от тук.</string>
+    <string name="noGiftCardsGroup">Създайте карти и ги зачислите към списък от тук.</string>
+    <string name="translate_platform">в Weblate</string>
+    <string name="shortcutSelectCard">Избор на карта</string>
+    <string name="starred">Със звезда</string>
+    <string name="set_scale">Мащаб</string>
+    <string name="showMoreInfo">Показване на информация</string>
+    <string name="hideMoreInfo">Скриване на информация</string>
+    <string name="options">Настройки</string>
+    <string name="card_ids_copied">Идентификаторите са копирани</string>
+    <plurals name="balancePoints">
+        <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>
 </resources>

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

@@ -1,7 +1,7 @@
 <?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="action_add">Přidat</string>
-    <string name="noGiftCards">Klepnutím na tlačítko + plus přidáte kartu nebo ji nejprve importujete z nabídky⋮.</string>
+    <string name="noGiftCards">Klepnutím na tlačítko + plus přidáte kartu nebo ji nejprve importujete z nabídky ⋮.</string>
     <string name="storeName">Název</string>
     <string name="note">Poznámka</string>
     <string name="cardId">ID karty</string>
@@ -15,21 +15,21 @@
     <string name="sendLabel">Odeslat…</string>
     <string name="editCardTitle">Editovat věrnostní kartu</string>
     <string name="addCardTitle">Přidat věrnostní kartu</string>
-    <string name="scanCardBarcode">Skenování Čárový Kód Karty</string>
+    <string name="scanCardBarcode">Skenování čárového kódu</string>
     <string name="noStoreError">Zadáno žádné jméno</string>
-    <string name="noCardIdError">Žádné ID karty zadáno</string>
+    <string name="noCardIdError">ID nezadáno</string>
     <string name="importExport">Import/Export</string>
     <string name="exportName">Export</string>
-    <string name="importExportHelp">Zálohování karet vám umožní přesunout je do jiného zařízení.</string>
+    <string name="importExportHelp">Zálohování dat vám umožní přesunout je do jiného zařízení.</string>
     <string name="importSuccessfulTitle">Importováno</string>
     <string name="importFailedTitle">Import selhal</string>
-    <string name="importFailed">Nelze importovat karty</string>
-    <string name="exportSuccessfulTitle">Exportovat</string>
+    <string name="importFailed">Nelze provést import</string>
+    <string name="exportSuccessfulTitle">Exportováno</string>
     <string name="exportFailedTitle">Export selhal</string>
-    <string name="exportFailed">Nelze exportovat karty</string>
+    <string name="exportFailed">Nelze provést export</string>
     <string name="importing">Importuji…</string>
     <string name="exporting">Exportuji…</string>
-    <string name="noExternalStoragePermissionError">Udělit povolení externího úložiště pro import nebo export karet jako první</string>
+    <string name="noExternalStoragePermissionError">Udělit oprávnění přístupu k externímu úložišti pro import nebo export dat</string>
     <string name="importOptionFilesystemTitle">Import ze souborového systému</string>
     <string name="importOptionFilesystemExplanation">Vyberte konkrétní soubor v uložišti.</string>
     <string name="importOptionFilesystemButton">Ze souborového systému</string>
@@ -42,7 +42,7 @@
     <string name="debug_version_fmt">Verze: <xliff:g id="version">%s</xliff:g></string>
     <string name="app_revision_fmt">Informace o revizi: <xliff:g id="app_revision_url">%s</xliff:g></string>
     <string name="selectBarcodeTitle">Vyberte čárový kód</string>
-    <string name="copy_to_clipboard_toast">ID karty zkopírované do schránky</string>
+    <string name="copy_to_clipboard_toast">ID zkopírované do schránky</string>
     <string name="deleteTitle">Smazat kartu</string>
     <string name="deleteConfirmation">Opravdu chcete smazat tuto věrnostní kartu?</string>
     <string name="moveBarcodeToCenterOfScreen">Střed čárového kódu na obrazovce</string>
@@ -58,7 +58,7 @@
 \ncopyright © 2016–2020 Branden Archer</string>
     <string name="exportOptionExplanation">Data budou zapsána na místo podle vašeho výběru.</string>
     <string name="failedParsingImportUriError">Nelze analyzovat import URI</string>
-    <string name="noCardExistsError">Nelze najít kartu</string>
+    <string name="noCardExistsError">Kartu nelze najít</string>
     <string name="noCardsMessage">Nejprve přidejte kartu</string>
     <string name="cardShortcut">Zástupce Karty</string>
     <string name="share">Podíl</string>
@@ -69,10 +69,10 @@
     <string name="noBarcode">Žádný čárový kód</string>
     <string name="barcodeNoBarcode">Tato karta nemá čárový kód</string>
     <string name="barcodeType">Typ čárového kódu</string>
-    <string name="noMatchingGiftCards">Nic jsem nenašel. Zkuste změnit vyhledávání.</string>
+    <string name="noMatchingGiftCards">Nic nenalezeno. Zkuste změnit vyhledávání.</string>
     <string name="action_search">Vyhledávání</string>
-    <string name="thumbnailDescription">Miniatura karty</string>
-    <string name="card_ids_copied">Zkopírované ID karty(karet)</string>
+    <string name="thumbnailDescription">Miniatura</string>
+    <string name="card_ids_copied">Zkopírované ID</string>
     <plurals name="deleteCardsConfirmation">
         <item quantity="one">Opravdu chcete kartu <xliff:g>%d</xliff:g> trvale odstranit\?</item>
         <item quantity="few">Opravdu chcete karty <xliff:g>%d</xliff:g> trvale odstranit\?</item>
@@ -83,7 +83,7 @@
         <item quantity="few">Odstranit karty <xliff:g>%d</xliff:g></item>
         <item quantity="other">Odstranit karty <xliff:g>%d</xliff:g></item>
     </plurals>
-    <string name="importSuccessful">Data karty importována</string>
+    <string name="importSuccessful">Data importována</string>
     <string name="intent_import_card_from_url_share_text">Chci s Vámi sdílet kartu</string>
     <string name="settings_disable_lockscreen_while_viewing_card">Bránit uzamykání obrazovky</string>
     <string name="settings_keep_screen_on">Udržovat obrazovku zapnutou</string>
@@ -96,13 +96,12 @@
     <string name="settings_category_title_ui">Uživatelské rozhraní</string>
     <string name="settings">Nastavení</string>
     <string name="card">Karta</string>
-    <string name="balancePoints"><xliff:g>%s</xliff:g> bodů</string>
     <string name="balanceSentence">Zůstatek: <xliff:g>%s</xliff:g></string>
     <string name="expiryStateSentenceExpired">Platnost vypršela: <xliff:g>%s</xliff:g></string>
     <string name="expiryStateSentence">Platí do: <xliff:g>%s</xliff:g></string>
     <string name="moveDown">Přesunout dolů</string>
     <string name="moveUp">Přesunout nahoru</string>
-    <string name="enterBarcodeInstructions">Zadejte ID karty a níže vyberte typ čárového kódu nebo \"Tato karta nemá čárový kód\".</string>
+    <string name="enterBarcodeInstructions">Zadejte ID a níže vyberte typ čárového kódu nebo \"Tato karta nemá čárový kód\".</string>
     <string name="settings_brown_theme">Hnědá</string>
     <string name="settings_grey_theme">Šedá</string>
     <string name="settings_green_theme">Zelená</string>
@@ -121,22 +120,22 @@
     <string name="passwordRequired">Zadejte prosím heslo</string>
     <string name="no">Ne</string>
     <string name="yes">Ano</string>
-    <string name="updateBarcodeQuestionText">Změnili jste ID karty. Chcete také aktualizovat čárový kód, aby používal stejnou hodnotu\?</string>
+    <string name="updateBarcodeQuestionText">Změnili jste ID. Chcete také aktualizovat čárový kód, aby používal stejnou hodnotu\?</string>
     <string name="updateBarcodeQuestionTitle">Aktualizovat hodnotu čárového kódu\?</string>
     <string name="takePhoto">Pořídit fotku</string>
     <string name="removeImage">Odstranit obrázek</string>
     <string name="setBackImage">Nastavit obrázek zadní strany</string>
     <string name="setFrontImage">Nastavit obrázek přední strany</string>
     <string name="photos">Fotky</string>
-    <string name="backImageDescription">Obrázek zadní strany karty</string>
-    <string name="frontImageDescription">Obrázek přední strany karty</string>
+    <string name="backImageDescription">Obrázek zadní strany</string>
+    <string name="frontImageDescription">Obrázek přední strany</string>
     <string name="intent_import_card_from_url_share_multiple_text">Chci s Vámi sdílet kartu</string>
-    <string name="copy_to_clipboard_multiple_toast">ID karty zkopírováno do schránky</string>
+    <string name="copy_to_clipboard_multiple_toast">ID zkopírováno do schránky</string>
     <string name="wrongValueForBarcodeType">Hodnota není platná pro vybraný typ čárového kódu</string>
     <string name="unsupportedBarcodeType">Tento typ čárového kódu zatím nelze zobrazit. Možná bude podporován v pozdější verzi aplikace.</string>
     <string name="barcodeId">Hodnota čárového kódu</string>
     <string name="setBarcodeId">Nastavení hodnoty čárového kódu</string>
-    <string name="sameAsCardId">Stejné jako ID karty</string>
+    <string name="sameAsCardId">Stejné jako ID</string>
     <string name="importVoucherVaultMessage">Vyberte svůj <i>vouchervault.json</i> export z Voucher Vault, který chcete importovat.
 \nVytvořte jej tak, že nejprve stisknete tlačítko Exportovat v aplikaci Voucher Vault.</string>
     <string name="importVoucherVault">Import z Voucher Vault</string>
@@ -158,7 +157,7 @@
 \nNejsou shromažďovány žádné údaje, což může potvrdit každý, protože naše aplikace je svobodný software.</string>
     <string name="privacy_policy">Zásady soukromí</string>
     <string name="app_loyalty_card_keychain">Loyalty Card Keychain</string>
-    <string name="chooseImportType">Importovat data z\?</string>
+    <string name="chooseImportType">Importovat data z</string>
     <string name="parsingBalanceFailed"><xliff:g>%s</xliff:g> se nezdá být platným zůstatkem.</string>
     <string name="points">Body</string>
     <string name="currency">Měna</string>
@@ -167,7 +166,7 @@
     <string name="noBarcodeFound">Čarový kód nenalezen</string>
     <string name="groupsList">Skupiny: <xliff:g>%s</xliff:g></string>
     <string name="addFromImage">Výběr obrázku z galerie</string>
-    <string name="addManually">Ruční zadání ID karty</string>
+    <string name="addManually">Ruční zadání ID</string>
     <string name="leaveWithoutSaveConfirmation">Ukončit bez uložení\?</string>
     <string name="leaveWithoutSaveTitle">Ukončit</string>
     <string name="failedOpeningFileManager">Nejprve si nainstalujte správce souborů.</string>
@@ -178,10 +177,10 @@
         <item quantity="few"><xliff:g>%d</xliff:g> karty</item>
         <item quantity="other"><xliff:g>%d</xliff:g> karet</item>
     </plurals>
-    <string name="noGroups">Kliknutím na tlačítko + plus nejprve přidejte skupiny pro kategorizaci.</string>
+    <string name="noGroups">Kliknutím na tlačítko + plus přidejte skupiny pro kategorizaci.</string>
     <string name="groups">Skupiny</string>
     <string name="enter_group_name">Zadejte název skupiny</string>
-    <string name="exportSuccessful">Data karty exportována</string>
+    <string name="exportSuccessful">Data exportována</string>
     <string name="settings_display_barcode_max_brightness">Rozjasněné zobrazení čárového kódu</string>
     <string name="starImage">Oblíbená hvězda</string>
     <string name="app_copyright_fmt" tools:ignore="PluralsCandidate">Copyright © 2019–<xliff:g>%d</xliff:g> Sylvia van Os</string>
@@ -191,16 +190,16 @@
         <item quantity="other">Vybráno <xliff:g>%d</xliff:g> karet</item>
     </plurals>
     <string name="app_contributors">Přispěli: <xliff:g id="app_contributors">%s</xliff:g></string>
-    <string name="noGroupCards">Tato skupina neobsahuje žádné karty</string>
+    <string name="noGroupCards">Tato skupina je prázdná</string>
     <string name="sort_by">Seřadit podle</string>
-    <string name="reverse">Obrátit</string>
+    <string name="reverse">…v obráceném pořadí</string>
     <string name="sort_by_balance">Zůstatek</string>
     <string name="sort_by_expiry">Vypršení</string>
     <string name="sort_by_most_recently_used">Naposledy použité</string>
     <string name="sort_by_name">Název</string>
     <string name="swipeToSwitchImages">Přejetím nebo dlouhým stisknutím přepínáte obrázky</string>
     <string name="sort">Seřadit</string>
-    <string name="barcodeImageDescriptionWithType">Obrázek čárového kódu karty typu <xliff:g>%s</xliff:g></string>
+    <string name="barcodeImageDescriptionWithType">Obrázek čárového kódu <xliff:g>%s</xliff:g></string>
     <string name="version_history">Historie verzí</string>
     <string name="rate_this_app">Ohodnoťte tuto aplikaci</string>
     <string name="and_data_usage">a využití dat</string>
@@ -227,4 +226,12 @@
     <string name="translate_platform">na Weblate</string>
     <string name="showMoreInfo">Zobrazit podrobnosti</string>
     <string name="hideMoreInfo">Skrýt podrobnosti</string>
+    <string name="starred">S hvězdičkou</string>
+    <string name="set_scale">Nastavení měřítka</string>
+    <string name="options">Volby</string>
+    <plurals name="balancePoints">
+        <item quantity="one"><xliff:g>%s</xliff:g> bod</item>
+        <item quantity="few"><xliff:g>%s</xliff:g> body</item>
+        <item quantity="other"><xliff:g>%s</xliff:g> bodů</item>
+    </plurals>
 </resources>

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

@@ -92,7 +92,7 @@
     </plurals>
     <string name="groupsList">Gruppen: <xliff:g>%s</xliff:g></string>
     <string name="app_loyalty_card_keychain">Loyalty Card Keychain</string>
-    <string name="chooseImportType">Daten importieren aus?</string>
+    <string name="chooseImportType">Daten importieren aus</string>
     <string name="parsingBalanceFailed"><xliff:g>%s</xliff:g> scheint kein gültiges Guthaben zu sein.</string>
     <string name="points">Punkte</string>
     <string name="currency">Währung</string>
@@ -105,7 +105,6 @@
     <string name="editBarcode">Barcode ändern</string>
     <string name="barcode">Strichcode</string>
     <string name="card">Karte</string>
-    <string name="balancePoints"><xliff:g>%s</xliff:g> Punkte</string>
     <string name="balanceSentence">Guthaben: <xliff:g>%s</xliff:g></string>
     <string name="expiryStateSentenceExpired">Abgelaufen: <xliff:g>%s</xliff:g></string>
     <string name="expiryStateSentence">Läuft ab: <xliff:g>%s</xliff:g></string>
@@ -225,4 +224,11 @@
     <string name="hideMoreInfo">Infos ausblenden</string>
     <string name="set_scale">Größe festlegen</string>
     <string name="showMoreInfo">Infos anzeigen</string>
+    <string name="starred">als Favorit</string>
+    <plurals name="balancePoints">
+        <item quantity="one"><xliff:g>%s</xliff:g> Punkt</item>
+        <item quantity="other"><xliff:g>%s</xliff:g> Punkte</item>
+    </plurals>
+    <string name="settings_oled_dark">Rein schwarzer Hintergrund für dunkles Thema</string>
+    <string name="include_if_asking_support">Wenn Sie Unterstützung anfordern möchten, geben Sie bitte die folgenden Informationen an:</string>
 </resources>

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

@@ -99,7 +99,6 @@
     <string name="editBarcode">Editar el código de barras</string>
     <string name="barcode">Código de barras</string>
     <string name="card">Tarjeta</string>
-    <string name="balancePoints"><xliff:g>%s</xliff:g> puntos</string>
     <string name="expiryStateSentenceExpired">Expirado: <xliff:g>%s</xliff:g></string>
     <string name="expiryStateSentence">Expira: <xliff:g>%s</xliff:g></string>
     <string name="app_copyright_fmt" tools:ignore="PluralsCandidate">Derechos de autor © 2019-<xliff:g>%d</xliff:g> de Sylvia van Os.</string>

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

@@ -45,7 +45,6 @@
     <string name="editBarcode">Muokkaa viivakoodia</string>
     <string name="barcode">Viivakoodi</string>
     <string name="card">Kortti</string>
-    <string name="balancePoints"><xliff:g>%s</xliff:g> pistettä</string>
     <string name="balanceSentence">Saldo: <xliff:g>%s</xliff:g></string>
     <string name="expiryStateSentenceExpired">Vanhentunut: <xliff:g>%s</xliff:g></string>
     <string name="expiryStateSentence">Vanhenee: <xliff:g>%s</xliff:g></string>

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

@@ -96,7 +96,7 @@
 \nAUCUNE DONNÉE N’EST COLLECTÉE, ce que tout le monde peut confirmer puisque notre application est un logiciel libre.</string>
     <string name="privacy_policy">Politique de confidentialité</string>
     <string name="app_loyalty_card_keychain">Loyalty Card Keychain</string>
-    <string name="chooseImportType">Importer les données depuis \?</string>
+    <string name="chooseImportType">Importer les données depuis</string>
     <string name="parsingBalanceFailed"><xliff:g xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">%s</xliff:g> ne semble pas être un solde valide.</string>
     <string name="points">Points</string>
     <string name="currency">Monnaie</string>
@@ -109,7 +109,6 @@
     <string name="editBarcode">Modifier le code-barres</string>
     <string name="barcode">Code-barres</string>
     <string name="card">Carte</string>
-    <string name="balancePoints"><xliff:g xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">%s</xliff:g> points</string>
     <string name="balanceSentence">Solde : <xliff:g xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">%s</xliff:g></string>
     <string name="expiryStateSentenceExpired">Expiré : <xliff:g xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">%s</xliff:g></string>
     <string name="expiryStateSentence">Expire : <xliff:g xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">%s</xliff:g></string>
@@ -226,4 +225,10 @@
     <string name="set_scale">Définir une échelle</string>
     <string name="showMoreInfo">Afficher les infos</string>
     <string name="hideMoreInfo">Masquer les infos</string>
+    <plurals name="balancePoints">
+        <item quantity="one"><xliff:g>%s</xliff:g> point</item>
+        <item quantity="other"><xliff:g>%s</xliff:g> points</item>
+    </plurals>
+    <string name="settings_oled_dark">Fond noir pur pour le thème sombre</string>
+    <string name="include_if_asking_support">Si vous voulez demander de l\'aide, incluez les informations suivantes :</string>
 </resources>

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

@@ -0,0 +1,232 @@
+<?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="noGiftCards">Nyomja meg a + jelet a kártya hozzáadásához, vagy importáljon a ⋮ menüvel.</string>
+    <string name="action_add">Hozzáadás</string>
+    <string name="action_search">Keresés</string>
+    <plurals name="selectedCardCount">
+        <item quantity="one"><xliff:g>%d</xliff:g> kiválasztva</item>
+        <item quantity="other"><xliff:g>%d</xliff:g> kiválasztva</item>
+    </plurals>
+    <string name="noCardsMessage">Először adjon hozzá egy kártyát</string>
+    <string name="noGiftCardsGroup">Hozzon létre kártyákat, és rendelje hozzá a megfelelő csoporthoz.</string>
+    <string name="noMatchingGiftCards">Nincs eredmény. Próbálja módosítani a keresést.</string>
+    <string name="storeName">Név</string>
+    <string name="note">Feljegyzés</string>
+    <string name="cardId">Kártya azonosító</string>
+    <string name="barcodeType">Vonalkód típus</string>
+    <string name="barcodeNoBarcode">Nincs vonalkód</string>
+    <string name="noBarcode">Nincs vonalkód</string>
+    <string name="star">Kedvencekhez adás</string>
+    <string name="unstar">Kivétel a kedvencek közül</string>
+    <string name="cancel">Mégse</string>
+    <string name="save">Mentés</string>
+    <string name="edit">Szerkesztés</string>
+    <string name="delete">Törlés</string>
+    <string name="confirm">Alkalmaz</string>
+    <string name="lockScreen">Forgatás blokkolása</string>
+    <string name="unlockScreen">Blokkolás engedélyezése</string>
+    <plurals name="deleteCardsTitle">
+        <item quantity="one"><xliff:g>%d</xliff:g> törlése</item>
+        <item quantity="other"><xliff:g>%d</xliff:g> törlése</item>
+    </plurals>
+    <string name="deleteConfirmation">Véglegesen törli a kártyát\?</string>
+    <string name="ok">Rendben</string>
+    <string name="copy_to_clipboard">Azonosító másolása a vágólapra</string>
+    <string name="share">Megosztás</string>
+    <string name="sendLabel">Küldés…</string>
+    <string name="editCardTitle">Kártya szerkesztése</string>
+    <string name="addCardTitle">Kártya hozzáadása</string>
+    <string name="scanCardBarcode">Vonalkód szkennelése</string>
+    <string name="cardShortcut">Kártya parancsikon</string>
+    <string name="noStoreError">Nincs név megadva</string>
+    <string name="failedParsingImportUriError">Nem elemezhető az importált URI</string>
+    <string name="importExport">Import/Export</string>
+    <string name="exportName">Export</string>
+    <string name="importExportHelp">Az adataid mentése lehetővé teszi, hogy egy másik eszközre feltöltsd.</string>
+    <string name="importSuccessfulTitle">Importálva</string>
+    <string name="importFailedTitle">Importálás meghiúsult</string>
+    <string name="importFailed">Importálás nem hajtható végre</string>
+    <string name="exportSuccessfulTitle">Exportálva</string>
+    <string name="exportFailedTitle">Exportálás meghiúsult</string>
+    <plurals name="deleteCardsConfirmation">
+        <item quantity="one">Véglegesen törli a <xliff:g>%d</xliff:g> kártyát\?</item>
+        <item quantity="other">Véglegesen törli a <xliff:g>%d</xliff:g> kártyákat\?</item>
+    </plurals>
+    <string name="deleteTitle">Kártya törlése</string>
+    <string name="card_ids_copied">Azonosító(k) másolása</string>
+    <string name="barcodeImageDescriptionWithType"><xliff:g>%s</xliff:g> vonalkód képe</string>
+    <string name="noCardIdError">Nincs azonosító megadva</string>
+    <string name="noCardExistsError">Kártya nem található</string>
+    <string name="importStocardMessage">Válassza ki a <i>***-sync.zip</i> Stocard exportot.
+\nAdatinak exportját kérheti e-mailben a support@stocardapp.com címre írva.</string>
+    <string name="importVoucherVault">Importálás Voucher Vault-ból</string>
+    <string name="wrongValueForBarcodeType">Ez az érték meg megfelelő a vonalkód típushoz</string>
+    <string name="settings_green_theme">Zöld</string>
+    <string name="setBackImage">Hátlapi kép beállítása</string>
+    <string name="no">Nem</string>
+    <string name="passwordRequired">Kérem írja be a kódot</string>
+    <string name="settings_catima_theme">Catima</string>
+    <string name="exportPasswordHint">Kód beírása</string>
+    <string name="failedGeneratingShareURL">Nem lehetett megosztható címet generálni. Kérem jelentse ezt.</string>
+    <string name="settings_theme_color">Téma színe</string>
+    <string name="settings_grey_theme">Szürke</string>
+    <string name="sort">Rendez</string>
+    <string name="on_google_play">Google Play-en</string>
+    <string name="action_show_details">Részletek mutatása</string>
+    <string name="action_hide_details">Részletek elrejtése</string>
+    <string name="and_data_usage">és adat használat</string>
+    <string name="translate_platform">Weblate-en</string>
+    <string name="sort_by_name">Név</string>
+    <string name="sort_by_most_recently_used">Legutóbb használt</string>
+    <string name="sort_by_expiry">Lejárat</string>
+    <string name="rate_this_app">Értékelje az appot</string>
+    <string name="exportFailed">Exportálás sikertelen</string>
+    <string name="importing">Importálás…</string>
+    <string name="exporting">Exportálás…</string>
+    <string name="noExternalStoragePermissionError">Külső háttértárhoz való hozzáférés engedélyezése adat import vagy export miatt</string>
+    <string name="exportOptionExplanation">Az adatokat a kiválasztott helyre fogjuk menteni.</string>
+    <string name="importOptionFilesystemTitle">Importálás fájlrendszerből</string>
+    <string name="importOptionFilesystemButton">A fájlrendszerből</string>
+    <string name="importOptionApplicationTitle">Másik app használata</string>
+    <string name="importOptionApplicationExplanation">Használjon egy tetszőleges appot, vagy kedvenc fájl menedzserét a fájl megnyitásához.</string>
+    <string name="app_copyright_fmt" tools:ignore="PluralsCandidate">Szerzői Jog © 2019–<xliff:g>%d</xliff:g> Sylvia van Os</string>
+    <string name="app_license">Copyleft-elt gáttalan szoftver, GPLv3+ licenszelve</string>
+    <string name="about_title_fmt"><xliff:g id="app_name">%s</xliff:g> névjegye</string>
+    <string name="debug_version_fmt">Verzió: <xliff:g id="version">%s</xliff:g></string>
+    <string name="app_revision_fmt">Revíziós információ: <xliff:g id="app_revision_url">%s</xliff:g></string>
+    <string name="app_resources">Gáttalan külsős források: <xliff:g id="app_resources_list">%s</xliff:g></string>
+    <string name="selectBarcodeTitle">Vonalkód kiválasztása</string>
+    <string name="enterBarcodeInstructions">Írja be az azonosítót, majd válasszon egy vonalkódot, vagy a \"Nincs vonalkód\" opciót.</string>
+    <string name="copy_to_clipboard_toast">Azonosító vágólapra másolva</string>
+    <string name="starImage">Kedvencek csillag</string>
+    <string name="settings">Beállítások</string>
+    <string name="settings_category_title_ui">Felhasználói felület</string>
+    <string name="settings_theme">Téma</string>
+    <string name="settings_system_theme">Rendszer</string>
+    <string name="settings_light_theme">Világos</string>
+    <string name="settings_max_font_size_scale">Max. betű méret</string>
+    <string name="settings_display_barcode_max_brightness">Fényes vonalkód nézet</string>
+    <string name="settings_lock_barcode_orientation">Vonalkód tájolás zárolása</string>
+    <string name="settings_keep_screen_on">Képernyő bekapcsolva marad</string>
+    <string name="settings_disable_lockscreen_while_viewing_card">Képernyő zárólás megakadályozása</string>
+    <string name="intent_import_card_from_url_share_text">Meg akarok veled osztani egy kártyát</string>
+    <string name="importSuccessful">Adat importálva</string>
+    <string name="exportSuccessful">Adat exportálva</string>
+    <string name="enter_group_name">Adja meg a csoport nevét</string>
+    <string name="groups">Csoportok</string>
+    <string name="group_edit">Csoport szerkesztése</string>
+    <string name="group_name_is_empty">Csoport név nem lehet üres</string>
+    <string name="failedOpeningFileManager">Telepítsen egy fájl menedzsert.</string>
+    <string name="moveUp">Felfelé mozgatás</string>
+    <string name="moveDown">Lefelé mozgatás</string>
+    <string name="leaveWithoutSaveTitle">Kilépés</string>
+    <string name="leaveWithoutSaveConfirmation">Kilépés mentés nélkül\?</string>
+    <string name="addManually">Azonosító manuális beírása</string>
+    <string name="addFromImage">Kép kiválasztása a galériából</string>
+    <string name="editGroup">Csoportok szerkesztése: <xliff:g>%s</xliff:g></string>
+    <string name="expiryStateSentence">Érvényes: <xliff:g>%s</xliff:g></string>
+    <string name="balanceSentence">Egyenleg: <xliff:g>%s</xliff:g></string>
+    <string name="card">Kártya</string>
+    <string name="barcode">Vonalkód</string>
+    <string name="editBarcode">Vonalkód szerkesztése</string>
+    <string name="expiryDate">Lejárati dátum</string>
+    <string name="never">Soha</string>
+    <string name="chooseExpiryDate">Lejárati dátum kiválasztása</string>
+    <string name="moveBarcodeToTopOfScreen">Vonalkód feltolása a képernyő tetejére</string>
+    <string name="moveBarcodeToCenterOfScreen">Vonalkód középre igazítása</string>
+    <string name="noBarcodeFound">Nem található vonalkód</string>
+    <string name="errorReadingImage">Nem lehet olvasni a képet</string>
+    <string name="balance">Egyenleg</string>
+    <string name="currency">Valuta</string>
+    <string name="points">Pontok</string>
+    <string name="parsingBalanceFailed">A <xliff:g>%s</xliff:g> nem tűnik valós egyenlegnek.</string>
+    <string name="app_loyalty_card_keychain">Loyalty Card Keychain</string>
+    <string name="privacy_policy">Adatvédelmi Szabályzat</string>
+    <string name="accept">Elfogad</string>
+    <string name="importCatima">Importálás Catimából</string>
+    <string name="importFidme">Importálás FidMe-ből</string>
+    <string name="importLoyaltyCardKeychain">Importálás a Loyalty Card Keychain-ből</string>
+    <string name="importLoyaltyCardKeychainMessage">Válassza ki a Loyalty Card Keychain-ból importálni kívánt <i>LoyaltyCardKeychain.csv</i> export fájlt.
+\nLétrehozhatja az Import/Export menüből ha a Loyalty Card Keychain-ben rányom az Exportra.</string>
+    <string name="importStocard">Importálás Stocard-ból</string>
+    <string name="importVoucherVaultMessage">Válassza ki a <i>vouchervault.json</i> Voucher Vault exportját.
+\nLétrehozhatja az Export-ra nyomva a Voucher Vault-ban.</string>
+    <string name="barcodeId">Vonalkód érték</string>
+    <string name="sameAsCardId">Ugyanaz, mint az azonosító</string>
+    <string name="setBarcodeId">Vonalkód érték beállítása</string>
+    <string name="unsupportedBarcodeType">Ez a vonalkód típus még nem megjeleníthető. Feltehetően támogatva lesz egy későbbi verzióban.</string>
+    <string name="copy_to_clipboard_multiple_toast">Azonosítók a vágólapra másolva</string>
+    <string name="intent_import_card_from_url_share_multiple_text">Meg akarok veled osztani pár kártyát</string>
+    <string name="frontImageDescription">Előlapi kép</string>
+    <string name="backImageDescription">Hátlapi kép</string>
+    <string name="photos">Fotók</string>
+    <string name="setFrontImage">Előlapi kép beállítása</string>
+    <string name="removeImage">Kép eltávolítása</string>
+    <string name="takePhoto">Fénykép készítése</string>
+    <string name="updateBarcodeQuestionTitle">Vonalkód érték frissítése\?</string>
+    <string name="updateBarcodeQuestionText">Megváltoztatta az azonosító. Meg akarja ennek megfelelően változtatni a vonalkód értéket is\?</string>
+    <string name="yes">Igen</string>
+    <string name="exportPassword">Írjon be egy jelszót az export védelme érdekében (opcionális)</string>
+    <string name="turn_flashlight_on">Zseblámpa bekapcsolása</string>
+    <string name="turn_flashlight_off">Zseblámpa kikapcsolása</string>
+    <string name="settings_locale">Nyelv</string>
+    <string name="settings_system_locale">Rendszer</string>
+    <string name="selectColor">Szín kiválasztása</string>
+    <string name="setIcon">Ikon beállítása</string>
+    <string name="settings_pink_theme">Rózsaszín</string>
+    <string name="settings_magenta_theme">Magenta</string>
+    <string name="settings_violet_theme">Ibolyaszínű</string>
+    <string name="settings_blue_theme">Kék</string>
+    <string name="settings_sky_blue_theme">Égszínkék</string>
+    <string name="settings_brown_theme">Barna</string>
+    <string name="app_contributors">Lehetővé tette: <xliff:g id="app_contributors">%s</xliff:g></string>
+    <string name="showMoreInfo">Infó mutatása</string>
+    <string name="hideMoreInfo">Infó elrejtése</string>
+    <string name="swipeToSwitchImages">Húzza oldalra vagy tartsa nyomva a kép megváltoztatásáért</string>
+    <string name="sort_by_balance">Egyenleg</string>
+    <string name="reverse">...fordított sorrendben</string>
+    <string name="sort_by">Rendezés mint</string>
+    <string name="version_history">Verzió történet</string>
+    <string name="credits">Köszönet</string>
+    <string name="help_translate_this_app">Segítsen lefordítani az appot</string>
+    <string name="license">Licensz</string>
+    <string name="source_repository">Forrás repó</string>
+    <string name="on_github">GitBub-on</string>
+    <string name="report_error">Hiba Jelentése</string>
+    <string name="shortcutSelectCard">Válasszon egy kártyát</string>
+    <string name="options">Beállítások</string>
+    <string name="starred">Csillagozva</string>
+    <string name="set_scale">Méret választása</string>
+    <plurals name="groupCardCount">
+        <item quantity="one"><xliff:g>%d</xliff:g> kártya</item>
+        <item quantity="other"><xliff:g>%d</xliff:g> kártyák</item>
+    </plurals>
+    <plurals name="balancePoints">
+        <item quantity="one"><xliff:g>%s</xliff:g> pont</item>
+        <item quantity="other"><xliff:g>%s</xliff:g> pont</item>
+    </plurals>
+    <string name="chooseImportType">Adat importálása innen</string>
+    <string name="thumbnailDescription">Előkép</string>
+    <string name="importOptionFilesystemExplanation">Válassza ki a kívánt fájlt a fájlrendszerből.</string>
+    <string name="importOptionApplicationButton">Másik app használata</string>
+    <string name="about">Névjegy</string>
+    <string name="app_copyright_old">Készült a Loyalty Card Keychain alapján
+\nszerzői jog © 2016–2020 Branden Archer</string>
+    <string name="app_libraries">Gáttalan külsős mappák: <xliff:g id="app_libraries_list">%s</xliff:g></string>
+    <string name="settings_dark_theme">Sötét</string>
+    <string name="deleteConfirmationGroup">Csoport törlése\?</string>
+    <string name="noGroups">Nyomja meg a + gombot a csoportok kategorizálásához.</string>
+    <string name="group_name_already_in_use">Csoport név már létezik</string>
+    <string name="all">Mind</string>
+    <string name="noGroupCards">Ez a csoport üres</string>
+    <string name="group_updated">Csoport frissítve</string>
+    <string name="expiryStateSentenceExpired">Lejárt: <xliff:g>%s</xliff:g></string>
+    <string name="groupsList">Csoportok: <xliff:g>%s</xliff:g></string>
+    <string name="importCatimaMessage">Válassza ki a <i>catima.zip</i>-jét az importáláshoz.
+\nLétrehozhatja az Import/Export menüből az Exportálást megnyomva egy másik Catima appban.</string>
+    <string name="privacy_policy_popup_text">Adatvédelmi szabály értesítő (némely app bolt kéri):
+\n
+\nSEMMILYEN ADATGYŰJTÉS NINCS, amit bárki ellenőrizhet, lévén hogy az app gáttalan szoftver.</string>
+    <string name="importFidmeMessage">Válassza ki a <i>fidme-export-request-xxxxxx.zip</i> nevű FidMe exportot, majd importálja be és válassza a manuális vonalkód opciót utána.
+\nEzt a FidMe-ben megtalálja a profiljában az Adat Védelem résznél ha rányom az Adataim Kivonata linkre.</string>
+</resources>

app/src/main/res/values-in-rID/strings.xml

@@ -1,6 +1,6 @@
 <?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="app_revision_url">https://github.com/TheLastProject/Catima/releases</string>
+    <string name="app_revision_url">https://github.com/CatimaLoyalty/Android/releases</string>
     <string name="storeName">Nama</string>
     <string name="note">Keterangan</string>
     <string name="delete">Hapus</string>
@@ -143,7 +143,6 @@
     <string name="expiryStateSentence">Masa ber: <xliff:g>%s</xliff:g></string>
     <string name="expiryStateSentenceExpired">Kadaluwarsa: <xliff:g>%s</xliff:g></string>
     <string name="balanceSentence">Saldo: <xliff:g>%s</xliff:g></string>
-    <string name="balancePoints"><xliff:g>%s</xliff:g> poin</string>
     <string name="editBarcode">Ubah barcode</string>
     <string name="expiryDate">Tanggal masa berlaku</string>
     <string name="never">Tidak pernah</string>

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

@@ -102,7 +102,6 @@
     <string name="editBarcode">Modifica il codice a barre</string>
     <string name="barcode">Codice a barre</string>
     <string name="card">Carta</string>
-    <string name="balancePoints"><xliff:g>%s</xliff:g> punti</string>
     <string name="balanceSentence">Saldo: <xliff:g>%s</xliff:g></string>
     <string name="expiryStateSentenceExpired">Scaduta: <xliff:g>%s</xliff:g></string>
     <string name="expiryStateSentence">Scadenza: <xliff:g>%s</xliff:g></string>
@@ -226,4 +225,9 @@
     <string name="set_scale">Imposta la scala</string>
     <string name="showMoreInfo">Mostra info</string>
     <string name="hideMoreInfo">Nascondi info</string>
+    <plurals name="balancePoints">
+        <item quantity="one"><xliff:g>%s</xliff:g> punto</item>
+        <item quantity="other"><xliff:g>%s</xliff:g> punti</item>
+    </plurals>
+    <string name="settings_oled_dark">Sfondo nero puro per il tema scuro</string>
 </resources>

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

@@ -33,7 +33,6 @@
     <string name="editBarcode">バーコードの編集</string>
     <string name="barcode">バーコード</string>
     <string name="card">カード</string>
-    <string name="balancePoints"><xliff:g>%s</xliff:g> ポイント</string>
     <string name="balanceSentence">残高: <xliff:g>%s</xliff:g></string>
     <string name="expiryStateSentenceExpired">期限切れ: <xliff:g>%s</xliff:g></string>
     <string name="expiryStateSentence">期限: <xliff:g>%s</xliff:g></string>

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

@@ -104,7 +104,6 @@
     <string name="editBarcode">Redaguoti brūkšninį kodą</string>
     <string name="barcode">Brūkšninis kodas</string>
     <string name="card">Kortelė</string>
-    <string name="balancePoints"><xliff:g>%s</xliff:g> taškai</string>
     <string name="balanceSentence">Balansas: <xliff:g>%s</xliff:g></string>
     <string name="expiryStateSentenceExpired">Galiojimas baigėsi: <xliff:g>%s</xliff:g></string>
     <string name="expiryStateSentence">Nustoja galioti: <xliff:g>%s</xliff:g></string>

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

@@ -73,7 +73,7 @@
     <string name="starImage">Favorittstjerne</string>
     <string name="unstar">Fjern fra favoritter</string>
     <string name="star">Legg til i favoritter</string>
-    <string name="noGroups">Klikk på «+»- (pluss)-tegnet for å legge til grupper for kategorisering først.</string>
+    <string name="noGroups">Klikk på «+»- (pluss)-tegnet for å legge til grupper for kategorisering.</string>
     <string name="deleteConfirmationGroup">Slett gruppe?</string>
     <string name="all">Alle</string>
     <string name="groups">Grupper</string>
@@ -104,9 +104,8 @@
     <string name="points">Poeng</string>
     <string name="currency">Valuta</string>
     <string name="balance">Saldo</string>
-    <string name="balancePoints"><xliff:g>%s</xliff:g> poeng</string>
     <string name="balanceSentence">Saldo: <xliff:g>%s</xliff:g></string>
-    <string name="chooseImportType">Importer data fra?</string>
+    <string name="chooseImportType">Importer data fra</string>
     <string name="app_loyalty_card_keychain">Kundekortknippe</string>
     <string name="settings_disable_lockscreen_while_viewing_card">Forhindre skjermlås</string>
     <string name="settings_keep_screen_on">Behold skjerm påslått</string>
@@ -188,7 +187,7 @@
     <string name="noGroupCards">Denne gruppen er tom</string>
     <string name="barcodeImageDescriptionWithType">Bilde av <xliff:g>%s</xliff:g>-strekkode</string>
     <string name="swipeToSwitchImages">Dra eller hold lenge for å bygge bilder</string>
-    <string name="sort_by">Sorter etter</string>
+    <string name="sort_by">Sortering</string>
     <string name="reverse">…i omvendt rekkefølge</string>
     <string name="sort_by_balance">Saldo</string>
     <string name="sort_by_expiry">Utløp</string>
@@ -224,6 +223,12 @@
     <string name="options">Alternativer</string>
     <string name="starred">Stjernemerket</string>
     <string name="set_scale">Sett skalering</string>
-    <string name="showMoreInfo">Vis mer info</string>
-    <string name="hideMoreInfo">Skjul mer info</string>
+    <string name="showMoreInfo">Vis info</string>
+    <string name="hideMoreInfo">Skjul info</string>
+    <plurals name="balancePoints">
+        <item quantity="one"><xliff:g>%s</xliff:g> poeng</item>
+        <item quantity="other"><xliff:g>%s</xliff:g> poeng</item>
+    </plurals>
+    <string name="settings_oled_dark">Svart bakgrunn for mørk drakt</string>
+    <string name="include_if_asking_support">Inkluder følgende info hvis du vil ha hjelp:</string>
 </resources>

app/src/main/res/values-night/colors.xml

@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Palette generated by Material IO https://material.io/color/#!/?view.left=0&view.right=0&primary.color=3F51B5&secondary.color=FFC107 -->
-<!-- Colors manually flipped to dark variants -->
-<resources>
-    <color name="colorPrimary">#B53F3F</color>
-    <color name="colorPrimaryLight">#E87575</color>
-    <color name="colorPrimaryDark">#840000</color>
-    <color name="colorSecondary">#ffc107</color>
-    <color name="colorSecondaryLight">#fff350</color>
-    <color name="colorSecondaryDark">#c79100</color>
-    <color name="colorPrimaryText">#000000</color>
-    <color name="colorSecondaryText">#ffffff</color>
-
-    <color name="listItemHighlight">#88000000</color>
-
-    <color name="inputContrastBackground">#070707</color>
-    <color name="inputBackground">#000000</color>
-    <color name="inputBorder">#222222</color>
-    <color name="inputDividerBorder">#666666</color>
-
-    <color name="iconColor">#ffffff</color>
-
-    <color name="mainLoyaltyCardBackground">#000000</color>
-</resources>

app/src/main/res/values-night/themes.xml

@@ -0,0 +1,245 @@
+<resources>
+
+    <style name="AppTheme" parent="Theme.Material3.Dark.NoActionBar">
+        <item name="colorPrimary">@color/md_theme_dark_primary</item>
+        <item name="colorOnPrimary">@color/md_theme_dark_onPrimary</item>
+        <item name="colorPrimaryContainer">@color/md_theme_dark_primaryContainer</item>
+        <item name="colorOnPrimaryContainer">@color/md_theme_dark_onPrimaryContainer</item>
+        <item name="colorSecondary">@color/md_theme_dark_secondary</item>
+        <item name="colorOnSecondary">@color/md_theme_dark_onSecondary</item>
+        <item name="colorSecondaryContainer">@color/md_theme_dark_secondaryContainer</item>
+        <item name="colorOnSecondaryContainer">@color/md_theme_dark_onSecondaryContainer</item>
+        <item name="colorTertiary">@color/md_theme_dark_tertiary</item>
+        <item name="colorOnTertiary">@color/md_theme_dark_onTertiary</item>
+        <item name="colorTertiaryContainer">@color/md_theme_dark_tertiaryContainer</item>
+        <item name="colorOnTertiaryContainer">@color/md_theme_dark_onTertiaryContainer</item>
+        <item name="colorError">@color/md_theme_dark_error</item>
+        <item name="colorErrorContainer">@color/md_theme_dark_errorContainer</item>
+        <item name="colorOnError">@color/md_theme_dark_onError</item>
+        <item name="colorOnErrorContainer">@color/md_theme_dark_onErrorContainer</item>
+        <item name="android:colorBackground">@color/md_theme_dark_background</item>
+        <item name="colorOnBackground">@color/md_theme_dark_onBackground</item>
+        <item name="colorSurface">@color/md_theme_dark_surface</item>
+        <item name="colorOnSurface">@color/md_theme_dark_onSurface</item>
+        <item name="colorSurfaceVariant">@color/md_theme_dark_surfaceVariant</item>
+        <item name="colorOnSurfaceVariant">@color/md_theme_dark_onSurfaceVariant</item>
+        <item name="colorOutline">@color/md_theme_dark_outline</item>
+        <item name="colorOnSurfaceInverse">@color/md_theme_dark_inverseOnSurface</item>
+        <item name="colorSurfaceInverse">@color/md_theme_dark_inverseSurface</item>
+        <item name="colorPrimaryInverse">@color/md_theme_dark_primaryInverse</item>
+
+        <item name="windowActionModeOverlay">true</item>
+    </style>
+
+    <!-- note that this is not used directly, these are used to patch the active theme runtime with
+    theme.applyStyle
+    -->
+    <style name="DarkBackground">
+        <item name="android:colorBackground">#000000</item>
+        <item name="colorSurface">#000000</item>
+    </style>
+
+    <!-- color themes -->
+    <style name="pink">
+        <item name="colorPrimary">#FFB2C0</item>
+        <item name="colorOnPrimary">#670024</item>
+        <item name="colorPrimaryContainer">#900036</item>
+        <item name="colorOnPrimaryContainer">#FFD9DF</item>
+        <item name="colorSecondary">#E5BDC2</item>
+        <item name="colorOnSecondary">#43292D</item>
+        <item name="colorSecondaryContainer">#5C3F43</item>
+        <item name="colorOnSecondaryContainer">#FFD9DE</item>
+        <item name="colorTertiary">#EBBF90</item>
+        <item name="colorOnTertiary">#452B08</item>
+        <item name="colorTertiaryContainer">#5F411C</item>
+        <item name="colorOnTertiaryContainer">#FFDDB8</item>
+        <item name="colorError">#FFB4A9</item>
+        <item name="colorErrorContainer">#930006</item>
+        <item name="colorOnError">#680003</item>
+        <item name="colorOnErrorContainer">#FFDAD4</item>
+        <item name="android:colorBackground">#201A1B</item>
+        <item name="colorOnBackground">#ECE0E0</item>
+        <item name="colorSurface">#201A1B</item>
+        <item name="colorOnSurface">#ECE0E0</item>
+        <item name="colorSurfaceVariant">#524345</item>
+        <item name="colorOnSurfaceVariant">#D6C1C3</item>
+        <item name="colorOutline">#9F8C8E</item>
+        <item name="colorOnSurfaceInverse">#201A1B</item>
+        <item name="colorSurfaceInverse">#ECE0E0</item>
+        <item name="colorPrimaryInverse">#BC0049</item>
+    </style>
+
+    <style name="magenta">
+        <item name="colorPrimary">#FBAAFF</item>
+        <item name="colorOnPrimary">#570068</item>
+        <item name="colorPrimaryContainer">#7B0091</item>
+        <item name="colorOnPrimaryContainer">#FFD5FF</item>
+        <item name="colorSecondary">#D7BFD5</item>
+        <item name="colorOnSecondary">#3B2B3B</item>
+        <item name="colorSecondaryContainer">#534153</item>
+        <item name="colorOnSecondaryContainer">#F5DBF2</item>
+        <item name="colorTertiary">#F6B8AE</item>
+        <item name="colorOnTertiary">#4C251F</item>
+        <item name="colorTertiaryContainer">#663B34</item>
+        <item name="colorOnTertiaryContainer">#FFDAD2</item>
+        <item name="colorError">#FFB4A9</item>
+        <item name="colorErrorContainer">#930006</item>
+        <item name="colorOnError">#680003</item>
+        <item name="colorOnErrorContainer">#FFDAD4</item>
+        <item name="android:colorBackground">#1E1A1D</item>
+        <item name="colorOnBackground">#E9E0E5</item>
+        <item name="colorSurface">#1E1A1D</item>
+        <item name="colorOnSurface">#E9E0E5</item>
+        <item name="colorSurfaceVariant">#4D444C</item>
+        <item name="colorOnSurfaceVariant">#D0C3CC</item>
+        <item name="colorOutline">#998E96</item>
+        <item name="colorOnSurfaceInverse">#1E1A1D</item>
+        <item name="colorSurfaceInverse">#E9E0E5</item>
+        <item name="colorPrimaryInverse">#9A25AE</item>
+    </style>
+
+    <style name="violet">
+        <item name="colorPrimary">#D4BAFF</item>
+        <item name="colorOnPrimary">#3E008E</item>
+        <item name="colorPrimaryContainer">#5727A7</item>
+        <item name="colorOnPrimaryContainer">#ECDCFF</item>
+        <item name="colorSecondary">#CDC2DB</item>
+        <item name="colorOnSecondary">#342D41</item>
+        <item name="colorSecondaryContainer">#4B4358</item>
+        <item name="colorOnSecondaryContainer">#E9DEF7</item>
+        <item name="colorTertiary">#F0B8C5</item>
+        <item name="colorOnTertiary">#4A2530</item>
+        <item name="colorTertiaryContainer">#643A46</item>
+        <item name="colorOnTertiaryContainer">#FFD9E2</item>
+        <item name="colorError">#FFB4A9</item>
+        <item name="colorErrorContainer">#930006</item>
+        <item name="colorOnError">#680003</item>
+        <item name="colorOnErrorContainer">#FFDAD4</item>
+        <item name="android:colorBackground">#1D1B1F</item>
+        <item name="colorOnBackground">#E6E1E5</item>
+        <item name="colorSurface">#1D1B1F</item>
+        <item name="colorOnSurface">#E6E1E5</item>
+        <item name="colorSurfaceVariant">#49454E</item>
+        <item name="colorOnSurfaceVariant">#CBC4CF</item>
+        <item name="colorOutline">#948E99</item>
+        <item name="colorOnSurfaceInverse">#1D1B1F</item>
+        <item name="colorSurfaceInverse">#E6E1E5</item>
+        <item name="colorPrimaryInverse">#6F43BF</item>
+    </style>
+
+    <style name="blue">
+        <item name="colorPrimary">#B9C3FF</item>
+        <item name="colorOnPrimary">#08218A</item>
+        <item name="colorPrimaryContainer">#293CA0</item>
+        <item name="colorOnPrimaryContainer">#DDE0FF</item>
+        <item name="colorSecondary">#C4C5DD</item>
+        <item name="colorOnSecondary">#2D2F42</item>
+        <item name="colorSecondaryContainer">#43465A</item>
+        <item name="colorOnSecondaryContainer">#E0E1FA</item>
+        <item name="colorTertiary">#E5BAD7</item>
+        <item name="colorOnTertiary">#45263E</item>
+        <item name="colorTertiaryContainer">#5D3C55</item>
+        <item name="colorOnTertiaryContainer">#FFD7F3</item>
+        <item name="colorError">#FFB4A9</item>
+        <item name="colorErrorContainer">#930006</item>
+        <item name="colorOnError">#680003</item>
+        <item name="colorOnErrorContainer">#FFDAD4</item>
+        <item name="android:colorBackground">#1B1B1F</item>
+        <item name="colorOnBackground">#E4E1E6</item>
+        <item name="colorSurface">#1B1B1F</item>
+        <item name="colorOnSurface">#E4E1E6</item>
+        <item name="colorSurfaceVariant">#46464F</item>
+        <item name="colorOnSurfaceVariant">#C6C5D0</item>
+        <item name="colorOutline">#90909A</item>
+        <item name="colorOnSurfaceInverse">#1B1B1F</item>
+        <item name="colorSurfaceInverse">#E4E1E6</item>
+        <item name="colorPrimaryInverse">#4355B9</item>
+    </style>
+
+    <style name="skyblue">
+        <item name="colorPrimary">#8BCEFF</item>
+        <item name="colorOnPrimary">#003450</item>
+        <item name="colorPrimaryContainer">#004B71</item>
+        <item name="colorOnPrimaryContainer">#C8E6FF</item>
+        <item name="colorSecondary">#B7C8D8</item>
+        <item name="colorOnSecondary">#22323F</item>
+        <item name="colorSecondaryContainer">#384956</item>
+        <item name="colorOnSecondaryContainer">#D3E4F5</item>
+        <item name="colorTertiary">#CFBFE8</item>
+        <item name="colorOnTertiary">#362B4B</item>
+        <item name="colorTertiaryContainer">#4D4162</item>
+        <item name="colorOnTertiaryContainer">#ECDCFF</item>
+        <item name="colorError">#FFB4A9</item>
+        <item name="colorErrorContainer">#930006</item>
+        <item name="colorOnError">#680003</item>
+        <item name="colorOnErrorContainer">#FFDAD4</item>
+        <item name="android:colorBackground">#1A1C1E</item>
+        <item name="colorOnBackground">#E2E2E5</item>
+        <item name="colorSurface">#1A1C1E</item>
+        <item name="colorOnSurface">#E2E2E5</item>
+        <item name="colorSurfaceVariant">#41474D</item>
+        <item name="colorOnSurfaceVariant">#C1C7CE</item>
+        <item name="colorOutline">#8B9198</item>
+        <item name="colorOnSurfaceInverse">#1A1C1E</item>
+        <item name="colorSurfaceInverse">#E2E2E5</item>
+        <item name="colorPrimaryInverse">#006494</item>
+    </style>
+
+    <style name="green">
+        <item name="colorPrimary">#78DC77</item>
+        <item name="colorOnPrimary">#003907</item>
+        <item name="colorPrimaryContainer">#00530F</item>
+        <item name="colorOnPrimaryContainer">#93F990</item>
+        <item name="colorSecondary">#B9CCB3</item>
+        <item name="colorOnSecondary">#253423</item>
+        <item name="colorSecondaryContainer">#3B4B38</item>
+        <item name="colorOnSecondaryContainer">#D5E8CE</item>
+        <item name="colorTertiary">#A1CFD5</item>
+        <item name="colorOnTertiary">#00363B</item>
+        <item name="colorTertiaryContainer">#1E4D52</item>
+        <item name="colorOnTertiaryContainer">#BCEBF0</item>
+        <item name="colorError">#FFB4A9</item>
+        <item name="colorErrorContainer">#930006</item>
+        <item name="colorOnError">#680003</item>
+        <item name="colorOnErrorContainer">#FFDAD4</item>
+        <item name="android:colorBackground">#1A1C19</item>
+        <item name="colorOnBackground">#E2E3DD</item>
+        <item name="colorSurface">#1A1C19</item>
+        <item name="colorOnSurface">#E2E3DD</item>
+        <item name="colorSurfaceVariant">#424840</item>
+        <item name="colorOnSurfaceVariant">#C2C8BD</item>
+        <item name="colorOutline">#8C9288</item>
+        <item name="colorOnSurfaceInverse">#1A1C19</item>
+        <item name="colorSurfaceInverse">#E2E3DD</item>
+        <item name="colorPrimaryInverse">#006E17</item>
+    </style>
+
+    <style name="brown">
+        <item name="colorPrimary">#FFB598</item>
+        <item name="colorOnPrimary">#5C1A00</item>
+        <item name="colorPrimaryContainer">#7B2E0D</item>
+        <item name="colorOnPrimaryContainer">#FFDBCD</item>
+        <item name="colorSecondary">#E7BEB0</item>
+        <item name="colorOnSecondary">#442A20</item>
+        <item name="colorSecondaryContainer">#5D4035</item>
+        <item name="colorOnSecondaryContainer">#FFDBCD</item>
+        <item name="colorTertiary">#D5C78E</item>
+        <item name="colorOnTertiary">#383005</item>
+        <item name="colorTertiaryContainer">#50461A</item>
+        <item name="colorOnTertiaryContainer">#F1E2A7</item>
+        <item name="colorError">#FFB4A9</item>
+        <item name="colorErrorContainer">#930006</item>
+        <item name="colorOnError">#680003</item>
+        <item name="colorOnErrorContainer">#FFDAD4</item>
+        <item name="android:colorBackground">#201A18</item>
+        <item name="colorOnBackground">#EDE0DC</item>
+        <item name="colorSurface">#201A18</item>
+        <item name="colorOnSurface">#EDE0DC</item>
+        <item name="colorSurfaceVariant">#52433E</item>
+        <item name="colorOnSurfaceVariant">#D8C2BB</item>
+        <item name="colorOutline">#A08C86</item>
+        <item name="colorOnSurfaceInverse">#201A18</item>
+        <item name="colorSurfaceInverse">#EDE0DC</item>
+        <item name="colorPrimaryInverse">#9A4523</item>
+    </style>
+</resources>

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

@@ -104,9 +104,8 @@
     <string name="points">Aantal punten</string>
     <string name="currency">Valuta</string>
     <string name="balance">Saldo</string>
-    <string name="balancePoints"><xliff:g>%s</xliff:g> punten</string>
     <string name="balanceSentence">Saldo: <xliff:g>%s</xliff:g></string>
-    <string name="chooseImportType">Gegevens importeren uit…\?</string>
+    <string name="chooseImportType">Gegevens importeren uit</string>
     <string name="app_loyalty_card_keychain">Klantenkaartkluis</string>
     <string name="settings_disable_lockscreen_while_viewing_card">Schermvergrendeling uitschakelen</string>
     <string name="settings_keep_screen_on">Scherm niet uitschakelen</string>
@@ -226,4 +225,10 @@
     <string name="starred">Favoriet</string>
     <string name="hideMoreInfo">Informatie verbergen</string>
     <string name="set_scale">Schaal instellen</string>
+    <plurals name="balancePoints">
+        <item quantity="one"><xliff:g>%s</xliff:g> punt</item>
+        <item quantity="other"><xliff:g>%s</xliff:g> punten</item>
+    </plurals>
+    <string name="settings_oled_dark">Zwarte achtergrond gebruiken bij donker thema</string>
+    <string name="include_if_asking_support">Als je ondersteuning wilt, voorzie je verzoek dan van de volgende informatie:</string>
 </resources>

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

@@ -4,17 +4,17 @@
     <string name="importing">Importacion…</string>
     <string name="exportFailed">Exportacion pas possibla</string>
     <string name="exportSuccessfulTitle">Exportat</string>
-    <string name="importFailed">Importacion de vòstras cartas impossibla</string>
+    <string name="importFailed">Importacion impossibla</string>
     <string name="importFailedTitle">Fracàs de l’importacion</string>
     <string name="importSuccessfulTitle">Importat</string>
-    <string name="importExportHelp">Exportar vòstras cartas vos permet de las recuperar sus un autre aparelh.</string>
+    <string name="importExportHelp">La salvagarda de vòstras cartas vos permet de las recuperar sus un autre aparelh.</string>
     <string name="exportName">Exportar</string>
     <string name="importExport">Importar/Exportar</string>
     <string name="failedParsingImportUriError">Analisi impossibla l’URI d’importacion</string>
-    <string name="noCardExistsError">Cap de carta pas trobada</string>
-    <string name="noCardIdError">Cap de numèro de carta pas picat</string>
+    <string name="noCardExistsError">Impossible de trobar aquesta carta</string>
+    <string name="noCardIdError">Cap d’identificant pas picat</string>
     <string name="noStoreError">Cap de nom pas picat</string>
-    <string name="card_ids_copied">Num. de la carta copiada</string>
+    <string name="card_ids_copied">ID copiat(s)</string>
     <string name="noCardsMessage">Apondètz d’en primièr una carta</string>
     <string name="cardShortcut">Acorchi de carta</string>
     <string name="scanCardBarcode">Numerizar lo còdi de barras</string>
@@ -45,9 +45,25 @@
     </plurals>
     <string name="deleteTitle">Suprimir la carta</string>
     <string name="noBarcode">Cap de còdi de barras</string>
-    <string name="barcodeNoBarcode">Aquesta carta a pas cap de còdi de barras</string>
+    <string name="barcodeNoBarcode">Cap de còdi de barras</string>
     <plurals name="selectedCardCount">
-        <item quantity="one"><xliff:g>%d</xliff:g> carta seleccionada</item>
-        <item quantity="other"><xliff:g>%d</xliff:g> cartas seleccionadas</item>
+        <item quantity="one"><xliff:g>%d</xliff:g> seleccionada</item>
+        <item quantity="other"><xliff:g>%d</xliff:g> seleccionadas</item>
     </plurals>
+    <string name="settings">Paramètres</string>
+    <string name="settings_category_title_ui">Interfàcia utilizaire</string>
+    <string name="settings_theme">Tèma</string>
+    <string name="noGiftCards">Clicatz lo boton + per apondre una carta o utilizatz lo menú ⋮ per n’importar una.</string>
+    <string name="noMatchingGiftCards">Cap de resultat. Ensajatz de modificar vòstra recèrca.</string>
+    <string name="settings_light_theme">Clar</string>
+    <string name="settings_dark_theme">Escur</string>
+    <string name="noGroups">Clicatz lo boton + per apondre de grops de categorizar.</string>
+    <string name="addManually">Picar l’ID a la man</string>
+    <string name="settings_system_theme">Sistèma</string>
+    <string name="about">A prepaus</string>
+    <string name="about_title_fmt">A prepaus de <xliff:g id="app_name">%s</xliff:g></string>
+    <string name="addFromImage">Causir a la galariá</string>
+    <string name="groups">Grops</string>
+    <string name="groupsList">Grops : <xliff:g>%s</xliff:g></string>
+    <string name="settings_max_font_size_scale">Talha max. de la poliça</string>
 </resources>

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

@@ -152,7 +152,6 @@
     <string name="editBarcode">Edytuj kod kreskowy</string>
     <string name="barcode">Kod kreskowy</string>
     <string name="card">Karta</string>
-    <string name="balancePoints"><xliff:g>%s</xliff:g> punkty</string>
     <string name="balanceSentence">Saldo: <xliff:g>%s</xliff:g></string>
     <string name="expiryStateSentenceExpired">Wygasło: <xliff:g>%s</xliff:g></string>
     <string name="expiryStateSentence">Wygasa: <xliff:g>%s</xliff:g></string>

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

@@ -64,7 +64,6 @@
     <string name="expiryStateSentence">Expiram: <xliff:g>%s</xliff:g></string>
     <string name="expiryStateSentenceExpired">Expirados: <xliff:g>%s</xliff:g></string>
     <string name="balanceSentence">Saldo: <xliff:g>%s</xliff:g></string>
-    <string name="balancePoints"><xliff:g>%s</xliff:g> pontos</string>
     <string name="card">Cartão</string>
     <string name="barcode">Código de barras</string>
     <string name="editBarcode">Editar código de barras</string>

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

@@ -4,11 +4,11 @@
     <string name="importOptionFilesystemExplanation">Escolha um ficheiro específico a partir do sistema de ficheiros.</string>
     <string name="action_search">Pesquisa</string>
     <string name="star">Adicionar aos favoritos</string>
-    <string name="noMatchingGiftCards">Não foi encontrado nada. Tente alterar a sua pesquisa.</string>
+    <string name="noMatchingGiftCards">Sem resultados. Tente alterar a sua pesquisa.</string>
     <string name="storeName">Nome</string>
     <string name="note">Nota</string>
     <string name="barcodeType">Tipo de código de barras</string>
-    <string name="barcodeNoBarcode">Este cartão não tem código de barras</string>
+    <string name="barcodeNoBarcode">Sem código de barras</string>
     <string name="cancel">Cancelar</string>
     <string name="save">Guardar</string>
     <string name="edit">Editar</string>
@@ -29,8 +29,8 @@
     <string name="copy_to_clipboard">Copiar identificador para a área de transferência</string>
     <string name="sendLabel">Enviar…</string>
     <plurals name="selectedCardCount">
-        <item quantity="one"><xliff:g>%d</xliff:g> cartão selecionado</item>
-        <item quantity="other"><xliff:g>%d</xliff:g> cartões selecionados</item>
+        <item quantity="one"><xliff:g>%d</xliff:g> selecionado</item>
+        <item quantity="other"><xliff:g>%d</xliff:g> selecionados</item>
     </plurals>
     <string name="deleteConfirmation">Eliminar este cartão permanentemente\?</string>
     <string name="share">Partilhar</string>
@@ -41,13 +41,13 @@
     <string name="cardShortcut">Atalho do cartão</string>
     <string name="noCardsMessage">Adicione primeiro um cartão</string>
     <string name="noStoreError">Nenhum nome inserido</string>
-    <string name="noCardExistsError">Não foi possível encontrar o cartão</string>
+    <string name="noCardExistsError">Não foi possível encontrar esse cartão</string>
     <string name="failedParsingImportUriError">Não foi possível analisar o URI de importação</string>
     <string name="importExport">Importar / exportar</string>
     <string name="exportName">Exportar</string>
-    <string name="importSuccessful">Dados do cartão importados</string>
-    <string name="noGroups">Primeiro clique no botão + para adicionar grupos para categorização.</string>
-    <string name="noGroupCards">Este grupo não contém cartões</string>
+    <string name="importSuccessful">Dados importados</string>
+    <string name="noGroups">Clique no botão + para adicionar grupos para categorização.</string>
+    <string name="noGroupCards">Este grupo está vazio</string>
     <string name="intent_import_card_from_url_share_text">Quero partilhar um cartão</string>
     <string name="settings_display_barcode_max_brightness">Iluminar o código de barras</string>
     <string name="settings_keep_screen_on">Manter ecrã ligado</string>
@@ -55,7 +55,7 @@
     <string name="groups">Grupos</string>
     <string name="settings_lock_barcode_orientation">Bloquear orientação do código de barras</string>
     <string name="settings_disable_lockscreen_while_viewing_card">Desativar bloqueio do ecrã</string>
-    <string name="exportSuccessful">Dados do cartão exportados</string>
+    <string name="exportSuccessful">Dados exportados</string>
     <string name="all">Todos</string>
     <string name="deleteConfirmationGroup">Eliminar o grupo\?</string>
     <string name="settings">Configurações</string>
@@ -66,29 +66,28 @@
     <string name="settings_dark_theme">Escuro</string>
     <string name="settings_max_font_size_scale">Tamanho máximo da fonte</string>
     <string name="selectBarcodeTitle">Selecionar código de barras</string>
-    <string name="enterBarcodeInstructions">Introduza o identificador do cartão e depois escolha o tipo de código de barras abaixo ou \"Este cartão não tem código de barras\".</string>
-    <string name="copy_to_clipboard_toast">Identificador do cartão copiado para a área de transferência</string>
-    <string name="thumbnailDescription">Miniatura do cartão</string>
+    <string name="enterBarcodeInstructions">Introduza o identificador e depois escolha o tipo de código de barras abaixo ou \"Sem código de barras\".</string>
+    <string name="copy_to_clipboard_toast">Identificador copiado para a área de transferência</string>
+    <string name="thumbnailDescription">Miniatura</string>
     <string name="starImage">Favorito</string>
     <string name="failedOpeningFileManager">Instalar primeiro um gestor de ficheiros.</string>
     <string name="moveUp">Subir</string>
     <string name="moveDown">Descer</string>
     <string name="leaveWithoutSaveTitle">Sair</string>
-    <string name="noExternalStoragePermissionError">Conceda primeiro a autorização de acesso ao armazenamento externo para importar ou exportar cartões</string>
-    <string name="importExportHelp">A cópia de segurança dos seus cartões permite-lhe movê-los para outro dispositivo.</string>
+    <string name="noExternalStoragePermissionError">Conceda primeiro a autorização de acesso ao armazenamento externo para importar ou exportar dados</string>
+    <string name="importExportHelp">A cópia de segurança dos seus dados permite-lhe movê-los para outro dispositivo.</string>
     <string name="importSuccessfulTitle">Importado</string>
     <string name="importFailedTitle">A importação falhou</string>
-    <string name="importFailed">Não foi possível importar os cartões</string>
+    <string name="importFailed">Não foi possível importar</string>
     <string name="exportSuccessfulTitle">Exportado</string>
     <string name="exportFailedTitle">A exportação falhou</string>
-    <string name="exportFailed">Não foi possível exportar os cartões</string>
+    <string name="exportFailed">Não foi possível exportar</string>
     <string name="importing">A importar…</string>
     <string name="exporting">A exportar…</string>
     <string name="settings_sky_blue_theme">Azul céu</string>
     <string name="report_error">Reportar erro</string>
-    <string name="balancePoints"><xliff:g>%s</xliff:g> pontos</string>
     <string name="barcode">Código de barras</string>
-    <string name="chooseImportType">De onde importar os dados\?</string>
+    <string name="chooseImportType">Importar dados de</string>
     <string name="card">Cartão</string>
     <string name="expiryStateSentence">Expiram: <xliff:g>%s</xliff:g></string>
     <string name="app_resources">Recursos livres de terceiros: <xliff:g id="app_resources_list">%s</xliff:g></string>
@@ -98,7 +97,7 @@
     <string name="exportPassword">Defina uma palavra-passe para proteger a exportação (opcional)</string>
     <string name="exportPasswordHint">Digite a palavra-passe</string>
     <string name="setBarcodeId">Definir o valor do código de barras</string>
-    <string name="sameAsCardId">Igual ao identificador do cartão</string>
+    <string name="sameAsCardId">Igual ao identificador</string>
     <string name="importFidmeMessage">Selecione a exportação <i>fidme-export-request-xxxxxx.zip</i> do FidMe para importar e depois selecione os tipos de código de barras manualmente.
 \nPrimeiro crie a exportação no seu perfil do FidMe escolhendo a opção \"Proteção de dados\" e em seguida pressionando \"Extrair os meus dados\".</string>
     <string name="importStocardMessage">Selecione a exportação <i>***-sync.zip</i> do Stocard para importar.
@@ -107,15 +106,15 @@
     <string name="wrongValueForBarcodeType">O valor não é válido para o tipo de código de barras selecionado</string>
     <string name="intent_import_card_from_url_share_multiple_text">Quero partilhar alguns cartões</string>
     <string name="removeImage">Remover imagem</string>
-    <string name="backImageDescription">Imagem de trás do cartão</string>
-    <string name="frontImageDescription">Imagem frontal do cartão</string>
+    <string name="backImageDescription">Imagem de trás</string>
+    <string name="frontImageDescription">Imagem frontal</string>
     <string name="photos">Fotografias</string>
     <string name="passwordRequired">Introduza a palavra-passe</string>
     <string name="settings_green_theme">Verde</string>
     <string name="settings_grey_theme">Cinzento</string>
     <string name="settings_brown_theme">Castanho</string>
     <string name="updateBarcodeQuestionTitle">Atualizar o valor do código de barras\?</string>
-    <string name="updateBarcodeQuestionText">Alterou a identificação do cartão. Também quer atualizar o código de barras para usar o mesmo valor\?</string>
+    <string name="updateBarcodeQuestionText">Alterou o identificador. Também quer atualizar o código de barras para usar o mesmo valor\?</string>
     <string name="no">Não</string>
     <plurals name="groupCardCount">
         <item quantity="one"><xliff:g>%d</xliff:g> cartão</item>
@@ -130,7 +129,7 @@
     <string name="app_revision_fmt">Informação da revisão: <xliff:g id="app_revision_url">%s</xliff:g></string>
     <string name="expiryStateSentenceExpired">Expirados: <xliff:g>%s</xliff:g></string>
     <string name="leaveWithoutSaveConfirmation">Sair sem guardar\?</string>
-    <string name="addManually">Introduzir manualmente o identificador do cartão</string>
+    <string name="addManually">Introduzir manualmente o identificador</string>
     <string name="addFromImage">Selecionar imagem da galeria</string>
     <string name="groupsList">Grupos: <xliff:g>%s</xliff:g></string>
     <string name="balanceSentence">Saldo: <xliff:g>%s</xliff:g></string>
@@ -164,7 +163,7 @@
     <string name="importVoucherVaultMessage">Selecione a exportação <i>vouchervault.json</i> do Voucher Vault para importar.
 \nCrie-a primeiro pressionando a opção \"Exportar\" no Voucher Vault.</string>
     <string name="unsupportedBarcodeType">Este tipo de código de barras ainda não pode ser mostrado. Pode vir a ser suportado numa versão posterior da aplicação.</string>
-    <string name="copy_to_clipboard_multiple_toast">Identificação do cartão copiado para a área de transferência</string>
+    <string name="copy_to_clipboard_multiple_toast">Identificação copiado para a área de transferência</string>
     <string name="setFrontImage">Definir imagem frontal</string>
     <string name="setBackImage">Definir imagem de trás</string>
     <string name="failedGeneratingShareURL">Não foi possível gerar uma URL partilhável. Por favor reporte isto aos programadores.</string>
@@ -185,7 +184,7 @@
     <string name="sort_by_most_recently_used">Mais usados recentemente</string>
     <string name="sort_by_expiry">Validade</string>
     <string name="sort_by_balance">Saldo</string>
-    <string name="reverse">Inverter</string>
+    <string name="reverse">…na ordem inversa</string>
     <string name="sort_by">Ordenar por</string>
     <string name="version_history">Histórico de versões</string>
     <string name="credits">Créditos</string>
@@ -207,18 +206,29 @@
         <item quantity="other">Eliminar os cartões <xliff:g>%d</xliff:g> permanentemente\?</item>
     </plurals>
     <string name="ok">OK</string>
-    <string name="card_ids_copied">Identificadores dos cartões copiados</string>
-    <string name="barcodeImageDescriptionWithType">Imagem do código de barras do cartão do tipo <xliff:g>%s</xliff:g></string>
+    <string name="card_ids_copied">Identificadores copiados</string>
+    <string name="barcodeImageDescriptionWithType">Imagem do código de barras <xliff:g>%s</xliff:g></string>
     <string name="group_edit">Editar grupo</string>
     <string name="group_name_already_in_use">O nome do grupo já está a ser usado</string>
     <string name="group_name_is_empty">O nome do grupo não pode estar vazio</string>
     <string name="group_updated">Grupo atualizado</string>
     <string name="editGroup">A editar grupo: <xliff:g>%s</xliff:g></string>
-    <string name="noGiftCardsGroup">Ainda não tem nenhum cartão de fidelidade. Assim que tenha adicionado alguns, pode atribuí-los ao grupo aqui.</string>
+    <string name="noGiftCardsGroup">Crie alguns cartões e atribua-os depois ao grupo aqui.</string>
     <string name="selectColor">Selecionar cor</string>
     <string name="setIcon">Definir ícone</string>
     <string name="action_show_details">Mostrar detalhes</string>
     <string name="action_hide_details">Ocultar detalhes</string>
     <string name="shortcutSelectCard">Selecione um cartão</string>
     <string name="translate_platform">no Weblate</string>
+    <string name="starred">Estrela</string>
+    <string name="set_scale">Escala de set</string>
+    <string name="showMoreInfo">Mostrar info</string>
+    <string name="hideMoreInfo">Ocultar informação</string>
+    <string name="options">Opções</string>
+    <plurals name="balancePoints">
+        <item quantity="one"><xliff:g>%s</xliff:g> ponto</item>
+        <item quantity="other"><xliff:g>%s</xliff:g> pontos</item>
+    </plurals>
+    <string name="settings_oled_dark">Fundo preto puro para tema negro</string>
+    <string name="include_if_asking_support">Se quiser pedir ajuda, inclua as seguintes informações:</string>
 </resources>

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

@@ -63,8 +63,8 @@
     <string name="settings_system_theme">Системная</string>
     <string name="settings_light_theme">Светлая</string>
     <string name="settings_dark_theme">Тёмная</string>
-    <string name="settings_display_barcode_max_brightness">Максимальная яркость при показе карты</string>
-    <string name="settings_lock_barcode_orientation">Портретная ориентация экрана при показе карты</string>
+    <string name="settings_display_barcode_max_brightness">Максимальная яркость при отображении карты</string>
+    <string name="settings_lock_barcode_orientation">Портретная ориентация экрана при отображении карты</string>
     <string name="intent_import_card_from_url_share_text">Я хочу поделиться с вами картой</string>
     <string name="exportSuccessful">Данные успешно экспортированы</string>
     <string name="all">Все</string>
@@ -82,7 +82,6 @@
     <string name="leaveWithoutSaveConfirmation">Выйти без сохранения\?</string>
     <string name="leaveWithoutSaveTitle">Выход</string>
     <string name="failedOpeningFileManager">Требуется файловый менеджер.</string>
-    <string name="balancePoints"><xliff:g>%s</xliff:g> баллов</string>
     <string name="balanceSentence">Баланс: <xliff:g>%s</xliff:g></string>
     <string name="expiryStateSentenceExpired">Срок действия истёк: <xliff:g>%s</xliff:g></string>
     <string name="expiryStateSentence">Срок действия истекает: <xliff:g>%s</xliff:g></string>
@@ -94,7 +93,7 @@
 \nНИКАКИЕ ДАННЫЕ НЕ СОБИРАЮТСЯ ВООБЩЕ, что может подтвердить любой, так как наше приложение является свободным программным обеспечением.</string>
     <string name="privacy_policy">Политика конфиденциальности</string>
     <string name="app_loyalty_card_keychain">Loyalty Card Keychain</string>
-    <string name="chooseImportType">Откуда импортировать данные\?</string>
+    <string name="chooseImportType">Откуда импортировать данные</string>
     <string name="balance">Баланс</string>
     <string name="moveBarcodeToTopOfScreen">Переместить штрих-код в верхнюю часть экрана</string>
     <string name="moveBarcodeToCenterOfScreen">Центрировать штрих-код на экране</string>
@@ -234,4 +233,12 @@
     <string name="hideMoreInfo">Скрыть данные</string>
     <string name="showMoreInfo">Показать данные</string>
     <string name="starred">Избранное</string>
+    <plurals name="balancePoints">
+        <item quantity="one"><xliff:g>%s</xliff:g> балл</item>
+        <item quantity="few"><xliff:g>%s</xliff:g> балла</item>
+        <item quantity="many"><xliff:g>%s</xliff:g> баллов</item>
+        <item quantity="other"><xliff:g>%s</xliff:g> баллов</item>
+    </plurals>
+    <string name="settings_oled_dark">Чёрный фон для тёмной темы</string>
+    <string name="include_if_asking_support">Если вы хотите запросить поддержку, укажите следующую информацию:</string>
 </resources>

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

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2" xmlns:tools="http://schemas.android.com/tools">
     <string name="action_add">Pridať</string>
     <string name="noGiftCards">Zatiaľ nemáte žiadne vernostné karty. Kliknite na tlačidlo \"+\" (plus) vyššie a začnite.\n\nAplikácia Vernostné karty umožňuje nosiť svoje vernostné karty v telefóne, kde sú vždy na dosah.</string>
-    <string name="storeName">Obchod</string>
+    <string name="storeName">Názov</string>
     <string name="note">Poznámka</string>
     <string name="cardId">ID karty</string>
     <string name="cancel">Zrušiť</string>
@@ -19,17 +19,17 @@
     <string name="addCardTitle">Pridať kartu</string>
     <string name="scanCardBarcode">Zosnímajte čiarový kód na karte</string>
     <string name="cardShortcut">Skratka</string>
-    <string name="noCardsMessage">Nie sú uložené žiadne karty, vložte prvú</string>
+    <string name="noCardsMessage">Najprv pridajte kartu</string>
     <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="noCardIdError">Nebolo zadané ID</string>
+    <string name="noCardExistsError">Nepodarilo sa nájsť túto kartu</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>
-    <string name="importSuccessfulTitle">Import bol úspešný</string>
+    <string name="importSuccessfulTitle">Importované</string>
     <string name="importFailedTitle">Import zlyhal</string>
     <string name="importFailed">Zlyhal import</string>
-    <string name="exportSuccessfulTitle">Export bol úspešný</string>
+    <string name="exportSuccessfulTitle">Exportované</string>
     <string name="exportFailedTitle">Export zlyhal</string>
     <string name="exportFailed">Zlyhal export</string>
     <string name="importing">Importujem…</string>
@@ -90,7 +90,7 @@
     <string name="settings_disable_lockscreen_while_viewing_card">Zabráňte uzamknutiu obrazovky</string>
     <string name="settings_keep_screen_on">Nechajte obrazovku zapnutú</string>
     <string name="settings_max_font_size_scale">Maximálna veľkosť písma</string>
-    <string name="card_ids_copied">Skopírované ID karty</string>
+    <string name="card_ids_copied">Skopírované ID</string>
     <string name="unstar">Odstrániť z obľúbených</string>
     <string name="settings_dark_theme">Tmavé</string>
     <string name="settings_light_theme">Svetlo</string>
@@ -101,4 +101,111 @@
     <string name="exportOptionExplanation">Údaje sa zapíšu na vami zvolené miesto.</string>
     <string name="failedParsingImportUriError">Nepodarilo sa analyzovať import URI</string>
     <string name="share">Zdieľať</string>
-</resources>
+    <string name="barcodeImageDescriptionWithType">Obrázok čiarového kódu <xliff:g>%s</xliff:g></string>
+    <string name="groupsList">Skupiny: <xliff:g>%s</xliff:g></string>
+    <plurals name="deleteCardsTitle">
+        <item quantity="one">Odstrániť <xliff:g>%d</xliff:g> kartu</item>
+        <item quantity="few">Odstrániť <xliff:g>%d</xliff:g> karty</item>
+        <item quantity="other">Odstrániť <xliff:g>%d</xliff:g> kariet</item>
+    </plurals>
+    <plurals name="selectedCardCount">
+        <item quantity="one"><xliff:g>%d</xliff:g> vybraná karta</item>
+        <item quantity="few"><xliff:g>%d</xliff:g> vybrané karty</item>
+        <item quantity="other"><xliff:g>%d</xliff:g> vybraných kariet</item>
+    </plurals>
+    <plurals name="groupCardCount">
+        <item quantity="one"><xliff:g>%d</xliff:g> karta</item>
+        <item quantity="few"><xliff:g>%d</xliff:g> karty</item>
+        <item quantity="other"><xliff:g>%d</xliff:g> kariet</item>
+    </plurals>
+    <plurals name="deleteCardsConfirmation">
+        <item quantity="one">Naozaj chcete natrvalo odstrániť <xliff:g>%d</xliff:g> vybranú kartu\?</item>
+        <item quantity="few">Naozaj chcete natrvalo odstrániť <xliff:g>%d</xliff:g> vybrané karty\?</item>
+        <item quantity="other">Naozaj chcete natrvalo odstrániť <xliff:g>%d</xliff:g> vybraných kariet\?</item>
+    </plurals>
+    <string name="group_edit">Upraviť skupinu</string>
+    <string name="group_name_already_in_use">Tento názov skupiny sa už používa</string>
+    <string name="group_name_is_empty">Názov skupiny nemôže byť prázdny</string>
+    <string name="group_updated">Skupina bola aktualizovaná</string>
+    <string name="editGroup">Úprava skupiny: <xliff:g>%s</xliff:g></string>
+    <string name="expiryStateSentence">Platí do: <xliff:g>%s</xliff:g></string>
+    <string name="expiryStateSentenceExpired">Platnosť vypršala: <xliff:g>%s</xliff:g></string>
+    <string name="balanceSentence">Zostatok: <xliff:g>%s</xliff:g></string>
+    <string name="importCatima">Import z aplikácie Catima</string>
+    <string name="settings_theme_color">Farba témy</string>
+    <string name="app_libraries">Slobodné knižnice tretích strán: <xliff:g id="app_libraries_list">%s</xliff:g></string>
+    <string name="app_resources">Slobodné zdroje tretích strán: <xliff:g id="app_resources_list">%s</xliff:g></string>
+    <string name="action_show_details">Zobraziť detaily</string>
+    <string name="importCatimaMessage">Vyberte svoj <i>catima.zip</i> export z aplikácie Catima, ktorý chcete importovať.
+\nVytvorte ho z ponuky Import/Export inej aplikácie Catima tak, že stlačíte tlačidlo Exportovať.</string>
+    <string name="accept">Prijať</string>
+    <string name="importLoyaltyCardKeychain">Import z aplikácie Loyalty Card Keychain</string>
+    <string name="importFidme">Import z aplikácie FidMe</string>
+    <string name="turn_flashlight_on">Zapnúť svetlo</string>
+    <string name="sort_by_name">Názov</string>
+    <string name="sort_by_most_recently_used">Naposledy použité</string>
+    <string name="sort_by_balance">Zostatok</string>
+    <string name="reverse">…v obrátenom poradí</string>
+    <string name="on_github">na GitHube</string>
+    <string name="sort_by_expiry">Koniec platnosti</string>
+    <string name="sort_by">Zoradiť podľa</string>
+    <string name="version_history">História verzií</string>
+    <string name="source_repository">Repozitár zdrojového kódu</string>
+    <string name="on_google_play">na Google Play</string>
+    <string name="report_error">Nahlásiť chybu</string>
+    <string name="translate_platform">na Weblate</string>
+    <string name="showMoreInfo">Zobraziť podrobnosti</string>
+    <string name="hideMoreInfo">Skryť podrobnosti</string>
+    <string name="action_hide_details">Skryť detaily</string>
+    <string name="yes">Áno</string>
+    <string name="importStocard">Import z aplikácie Stocard</string>
+    <string name="selectColor">Vybrať farbu</string>
+    <string name="setIcon">Nastaviť ikonu</string>
+    <string name="settings_catima_theme">Catima</string>
+    <string name="settings_pink_theme">Ružová</string>
+    <string name="settings_magenta_theme">Purpurová</string>
+    <string name="settings_violet_theme">Fialová</string>
+    <string name="settings_blue_theme">Modrá</string>
+    <string name="settings_sky_blue_theme">Azurová</string>
+    <string name="settings_green_theme">Zelená</string>
+    <string name="settings_grey_theme">Šedá</string>
+    <string name="settings_brown_theme">Hnedá</string>
+    <string name="sort">Zoradiť</string>
+    <string name="help_translate_this_app">Pomôžte preložiť túto aplikáciu</string>
+    <string name="license">Licencia</string>
+    <string name="credits">Poďakovanie</string>
+    <string name="card">Karta</string>
+    <string name="rate_this_app">Ohodnoťte túto aplikáciu</string>
+    <string name="exportPassword">Nastavenie hesla na ochranu exportu (voliteľné)</string>
+    <string name="exportPasswordHint">Zadajte heslo</string>
+    <string name="failedGeneratingShareURL">Nepodarilo sa vygenerovať zdieľateľnú adresu URL. Nahláste to, prosím.</string>
+    <string name="turn_flashlight_off">Vypnúť svetlo</string>
+    <string name="settings_locale">Jazyk</string>
+    <string name="settings_system_locale">Systém</string>
+    <string name="app_copyright_old">Na základe Loyalty Card Keychain
+\ncopyright © 2016–2020 Branden Archer</string>
+    <string name="app_copyright_fmt" tools:ignore="PluralsCandidate">Copyright © 2019–<xliff:g>%d</xliff:g> Sylvia van Os</string>
+    <string name="expiryDate">Platnosť</string>
+    <string name="barcode">Čiarový kód</string>
+    <string name="editBarcode">Upraviť čiarový kód</string>
+    <string name="privacy_policy">Zásady ochrany osobných údajov</string>
+    <string name="importVoucherVault">Import z Voucher Vault</string>
+    <string name="barcodeId">Hodnota čiarového kódu</string>
+    <string name="sameAsCardId">Rovnaké ako ID</string>
+    <string name="setBarcodeId">Nastavenie hodnoty čiarového kódu</string>
+    <string name="unsupportedBarcodeType">Tento typ čiarového kódu zatiaľ nie je možné zobraziť. Možno bude podporovaný v neskoršej verzii aplikácie.</string>
+    <string name="wrongValueForBarcodeType">Hodnota nie je platná pre vybraný typ čiarového kódu</string>
+    <string name="frontImageDescription">Obrázok prednej strany</string>
+    <string name="backImageDescription">Obrázok zadnej strany</string>
+    <string name="photos">Fotky</string>
+    <string name="setFrontImage">Nastaviť obrázok prednej strany</string>
+    <string name="setBackImage">Nastaviť obrázok zadnej strany</string>
+    <string name="removeImage">Odstrániť obrázok</string>
+    <string name="takePhoto">Urobiť fotku</string>
+    <string name="updateBarcodeQuestionTitle">Aktualizovať hodnotu čiarového kódu\?</string>
+    <string name="updateBarcodeQuestionText">Zmenili ste ID. Chcete aktualizovať aj čiarový kód, aby používal rovnakú hodnotu\?</string>
+    <string name="no">Nie</string>
+    <string name="passwordRequired">Zadajte prosím heslo</string>
+    <string name="parsingBalanceFailed"><xliff:g>%s</xliff:g> sa nezdá byť platným zostatkom.</string>
+    <string name="noGiftCardsGroup">Vytvorte niekoľko kariet a potom ich priraďte k tejto skupine.</string>
+</resources>

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

@@ -129,7 +129,6 @@
     <string name="balance">Stanje na računu</string>
     <string name="errorReadingImage">Slike ni bilo mogoče prebrati</string>
     <string name="noBarcodeFound">Črtna koda ni bila najdena</string>
-    <string name="balancePoints"><xliff:g>%s</xliff:g> točk</string>
     <string name="balanceSentence">Stanje: <xliff:g>%s</xliff:g></string>
     <string name="chooseImportType">Uvoz iz?</string>
     <string name="importCatima">Izvoz iz aplikacije Catima</string>

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

@@ -42,7 +42,6 @@
     <string name="leaveWithoutSaveConfirmation">Avsluta utan att spara\?</string>
     <string name="addManually">Ange ID manuellt</string>
     <string name="addFromImage">Välj bild från galleriet</string>
-    <string name="balancePoints"><xliff:g>%s</xliff:g> poäng</string>
     <string name="card">Kort</string>
     <string name="barcode">Streckkod</string>
     <string name="editBarcode">Redigera streckkod</string>
@@ -51,7 +50,7 @@
     <string name="moveBarcodeToCenterOfScreen">Centrera streckkoden på skärmen</string>
     <string name="noBarcodeFound">Hittade ingen streckkod</string>
     <string name="points">Poäng</string>
-    <string name="chooseImportType">Importera data från...\?</string>
+    <string name="chooseImportType">Importera data från</string>
     <string name="accept">Acceptera</string>
     <string name="importCatima">Importera från Catima</string>
     <string name="importFidme">Importera från FidMe</string>
@@ -221,4 +220,12 @@
     <string name="noGiftCardsGroup">Skapa några kort och placera dem sedan i den här gruppen.</string>
     <string name="translate_platform">på Weblate</string>
     <string name="shortcutSelectCard">Välj ett kort</string>
+    <string name="showMoreInfo">Visa info</string>
+    <string name="starred">Stjärnmärkt</string>
+    <string name="hideMoreInfo">Dölj info</string>
+    <string name="options">Alternativ</string>
+    <plurals name="balancePoints">
+        <item quantity="one"><xliff:g>%s</xliff:g> poäng</item>
+        <item quantity="other"><xliff:g>%s</xliff:g> poäng</item>
+    </plurals>
 </resources>

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

@@ -57,7 +57,7 @@
 \nHİÇBİR VERİ TOPLANMAMAKTADIR ve uygulamamız özgür yazılım olduğu için bunu herkes doğrulayabilir.</string>
     <string name="privacy_policy">Gizlilik Politikası</string>
     <string name="app_loyalty_card_keychain">Loyalty Card Keychain</string>
-    <string name="chooseImportType">Veriler nereden içe aktarılsın\?</string>
+    <string name="chooseImportType">Verileri şuradan içe aktar</string>
     <string name="parsingBalanceFailed"><xliff:g>%s</xliff:g> geçerli bir bakiye gibi görünmüyor.</string>
     <string name="points">Puan</string>
     <string name="currency">Para birimi</string>
@@ -72,7 +72,6 @@
     <string name="editBarcode">Barkodu düzenle</string>
     <string name="barcode">Barkod</string>
     <string name="card">Kart</string>
-    <string name="balancePoints"><xliff:g>%s</xliff:g> puan</string>
     <string name="balanceSentence">Bakiye: <xliff:g>%s</xliff:g></string>
     <string name="expiryStateSentenceExpired">Süresi doldu: <xliff:g>%s</xliff:g></string>
     <string name="expiryStateSentence">Son kullanma tarihi: <xliff:g>%s</xliff:g></string>
@@ -226,4 +225,10 @@
     <string name="hideMoreInfo">Bilgileri gizle</string>
     <string name="starred">Yıldızlı</string>
     <string name="set_scale">Ölçeği ayarla</string>
+    <plurals name="balancePoints">
+        <item quantity="one"><xliff:g>%s</xliff:g> puan</item>
+        <item quantity="other"><xliff:g>%s</xliff:g> puan</item>
+    </plurals>
+    <string name="settings_oled_dark">Koyu tema için saf siyah arka plan</string>
+    <string name="include_if_asking_support">Destek talep etmek istiyorsanız, aşağıdaki bilgileri ekleyin:</string>
 </resources>

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

@@ -56,7 +56,6 @@
     <string name="editBarcode">Редагувати штрих-код</string>
     <string name="barcode">Штрих-код</string>
     <string name="card">Картка</string>
-    <string name="balancePoints"><xliff:g>%s</xliff:g> балів</string>
     <string name="balanceSentence">Баланс: <xliff:g>%s</xliff:g></string>
     <string name="expiryStateSentenceExpired">Термін дії закінчився: <xliff:g>%s</xliff:g></string>
     <string name="expiryStateSentence">Термін дії закінчується: <xliff:g>%s</xliff:g></string>
@@ -230,4 +229,8 @@
     <string name="translate_platform">на Weblate</string>
     <string name="shortcutSelectCard">Оберіть карту</string>
     <string name="options">Параметри</string>
+    <string name="showMoreInfo">Відобразити дані</string>
+    <string name="starred">Обране</string>
+    <string name="set_scale">Зміна масштабу</string>
+    <string name="hideMoreInfo">Сховати дані</string>
 </resources>

app/src/main/res/values-v21/styles.xml

@@ -1,9 +0,0 @@
-<resources>
-
-    <style name="AppTheme.NoActionBar" parent="AppTheme">
-        <item name="windowActionBar">false</item>
-        <item name="windowNoTitle">true</item>
-        <item name="android:windowDrawsSystemBarBackgrounds">true</item>
-    </style>
-
-</resources>

app/src/main/res/values-zh-rCN/strings.xml

@@ -41,7 +41,7 @@
 \n本应用没有收集任何数据，任何人都可以查阅源码来确认，因为本软件是自由软件。</string>
     <string name="privacy_policy">隐私政策</string>
     <string name="app_loyalty_card_keychain">Loyalty Card Keychain</string>
-    <string name="chooseImportType">导入数据？</string>
+    <string name="chooseImportType">数据导入源</string>
     <string name="parsingBalanceFailed"><xliff:g>%s</xliff:g>似乎不是有效的余额。</string>
     <string name="points">积分</string>
     <string name="currency">货币</string>
@@ -54,7 +54,6 @@
     <string name="never">从不</string>
     <string name="expiryDate">过期时间</string>
     <string name="editBarcode">编辑条形码</string>
-    <string name="balancePoints"><xliff:g>%s</xliff:g>分</string>
     <string name="balanceSentence">余额：<xliff:g>%s</xliff:g></string>
     <string name="expiryStateSentenceExpired">过期：<xliff:g>%s</xliff:g></string>
     <string name="expiryStateSentence">过期: <xliff:g>%s</xliff:g></string>
@@ -173,4 +172,7 @@
     <string name="noGiftCardsGroup">创建一些卡片，然后分配给这里的小组。</string>
     <string name="barcodeImageDescriptionWithType"><xliff:g>%s</xliff:g>型条码图像</string>
     <string name="group_edit">编辑组</string>
+    <plurals name="balancePoints">
+        <item quantity="other"><xliff:g>%s</xliff:g> 点</item>
+    </plurals>
 </resources>

app/src/main/res/values-zh-rTW/strings.xml

@@ -1,17 +1,19 @@
 <?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="app_revision_url">https://github.com/TheLastProject/Catima/releases</string>
+    <string name="app_revision_url">https://github.com/CatimaLoyalty/Android/releases</string>
     <string name="action_search">搜尋</string>
     <string name="action_add">新增</string>
-    <string name="noGiftCards">點選 + 按鈕以新增卡片\n或從 ⋮ 選單中匯入卡片</string>
-    <string name="noMatchingGiftCards">沒有找到任何東西。試試其他關鍵字。</string>
+    <string name="noGiftCards">點選 + 按鈕以新增卡片，或從 ⋮ 選單中匯入卡片。</string>
+    <string name="noMatchingGiftCards">找不到相關結果。試試其他關鍵字。</string>
     <string name="storeName">名稱</string>
     <string name="note">註記</string>
     <string name="cardId">卡片 ID</string>
     <string name="barcodeType">條碼種類</string>
-    <string name="barcodeNoBarcode">此卡片沒有可用的條碼</string>
+    <string name="barcodeNoBarcode">沒有可用的條碼</string>
     <string name="noBarcode">無條碼</string>
-    <string name="privacy_policy_popup_text">隱私權政策（某些應用程式商店需要此條目）:  我們並不會收集任何資料！任何人都可以檢視我們的原始碼並驗證這點。</string>
+    <string name="privacy_policy_popup_text">隱私權政策（某些應用程式商店需要此條目）: 
+\n
+\n我們並不會收集任何資料！任何人都可以檢視我們的原始碼並驗證這點。</string>
     <string name="star">新增至收藏</string>
     <string name="app_license">公共版權 (Copylefted) 的自由軟體，許可 GPLv3+</string>
     <string name="unstar">從收藏中移除</string>
@@ -25,23 +27,22 @@
     <string name="accept">接受</string>
     <string name="addCardTitle">新增卡片</string>
     <string name="addFromImage">從圖庫中選擇圖片</string>
-    <string name="addManually">手動輸入卡片 ID</string>
+    <string name="addManually">手動輸入 ID</string>
     <string name="all">全部</string>
     <string name="balance">餘額</string>
     <string name="balanceSentence">餘額: <xliff:g>%s</xliff:g></string>
-    <string name="balancePoints"><xliff:g>%s</xliff:g> 點</string>
     <string name="app_copyright_old">基於 Loyalty Card Keychain\n著作權所有 © 2016–2020 Branden Archer</string>
     <string name="barcode">條碼</string>
     <string name="barcodeId">條碼內容</string>
-    <string name="barcodeImageDescriptionWithType">條碼種類 <xliff:g>%s</xliff:g> 的圖片</string>
+    <string name="barcodeImageDescriptionWithType">圖片為 <xliff:g>%s</xliff:g> 的條碼</string>
     <string name="card">卡片</string>
-    <string name="card_ids_copied">已複製卡片 ID(s)</string>
+    <string name="card_ids_copied">已複製 ID(s)</string>
     <string name="cardShortcut">卡片捷徑</string>
     <string name="chooseExpiryDate">選擇逾期日期</string>
-    <string name="chooseImportType">從哪裡匯入資料？</string>
+    <string name="chooseImportType">從地點匯入資料</string>
     <string name="copy_to_clipboard">已複製 ID 至剪貼簿中</string>
-    <string name="copy_to_clipboard_multiple_toast">已複製多個卡片 ID 至剪貼簿中</string>
-    <string name="copy_to_clipboard_toast">已複製卡片 ID 至剪貼簿中</string>
+    <string name="copy_to_clipboard_multiple_toast">已複製多個 ID 至剪貼簿中</string>
+    <string name="copy_to_clipboard_toast">已複製 ID 至剪貼簿中</string>
     <string name="credits">貢獻者</string>
     <string name="currency">幣別</string>
     <string name="debug_version_fmt">版本：<xliff:g id="version">%s</xliff:g></string>
@@ -51,29 +52,29 @@
     <string name="editBarcode">編輯條碼</string>
     <string name="editCardTitle">編輯圖片</string>
     <string name="enter_group_name">輸入群組名稱</string>
-    <string name="enterBarcodeInstructions">輸入卡片 ID、選擇條碼種類、或選擇「此卡片沒有可用的條碼」。</string>
+    <string name="enterBarcodeInstructions">輸入 ID、選擇條碼種類、或選擇「此卡片沒有可用的條碼」。</string>
     <string name="errorReadingImage">無法讀取此圖片</string>
     <string name="expiryDate">逾期日期</string>
     <string name="expiryStateSentence">逾期於：<xliff:g>%s</xliff:g></string>
     <string name="expiryStateSentenceExpired">已逾期：<xliff:g>%s</xliff:g></string>
-    <string name="exportFailed">無法匯出卡片</string>
+    <string name="exportFailed">無法進行匯出</string>
     <string name="exportFailedTitle">匯出失敗</string>
     <string name="exporting">匯出中…</string>
     <string name="exportName">匯出</string>
     <string name="exportOptionExplanation">資料將寫至您所選的位置。</string>
     <string name="exportPassword">透過密碼保護您的匯出檔 (選用)</string>
     <string name="exportPasswordHint">輸入密碼</string>
-    <string name="exportSuccessful">已匯出卡片資訊</string>
+    <string name="exportSuccessful">已匯出資料</string>
     <string name="exportSuccessfulTitle">已匯出</string>
     <string name="failedOpeningFileManager">請先安裝檔案管理員。</string>
     <string name="failedParsingImportUriError">無法讀取匯入 URI</string>
-    <string name="frontImageDescription">卡片 (正面)</string>
+    <string name="frontImageDescription">正面圖片</string>
     <string name="groups">群組</string>
     <string name="groupsList">群組：<xliff:g>%s</xliff:g></string>
     <string name="help_translate_this_app">幫助翻譯本程式</string>
     <string name="importExport">匯入/匯出</string>
     <string name="importFailedTitle">匯入失敗</string>
-    <string name="importFailed">無法匯入卡片</string>
+    <string name="importFailed">無法匯入資料</string>
     <string name="importing">匯入中…</string>
     <string name="importSuccessfulTitle">已匯入</string>
     <string name="intent_import_card_from_url_share_multiple_text">我想要分享些卡片給你</string>
@@ -84,8 +85,8 @@
     <string name="never">永不</string>
     <string name="no">否</string>
     <string name="noBarcodeFound">找不到可用的條碼</string>
-    <string name="noCardExistsError">無法找到卡片</string>
-    <string name="noCardIdError">尚未輸入卡片 ID</string>
+    <string name="noCardExistsError">無法找到此卡片</string>
+    <string name="noCardIdError">尚未輸入 ID</string>
     <string name="noCardsMessage">請先新增卡片</string>
     <string name="sort">排列</string>
     <string name="settings_catima_theme">Catima</string>
@@ -101,7 +102,7 @@
     <string name="sort_by_most_recently_used">最近使用</string>
     <string name="sort_by_expiry">逾期日期</string>
     <string name="sort_by_balance">餘額</string>
-    <string name="reverse">反序</string>
+    <string name="reverse">...以反序排列</string>
     <string name="sort_by">排列方式</string>
     <string name="version_history">版本歷史</string>
     <string name="source_repository">原始碼版本庫</string>
@@ -111,7 +112,7 @@
     <string name="on_google_play">於 Google Play</string>
     <string name="report_error">回報錯誤</string>
     <string name="setBarcodeId">設定條碼內容</string>
-    <string name="sameAsCardId">與卡片 ID 相同</string>
+    <string name="sameAsCardId">與 ID 相同</string>
     <string name="photos">圖片</string>
     <string name="setFrontImage">設定正面圖片</string>
     <string name="setBackImage">設定背面圖片</string>
@@ -128,7 +129,7 @@
     <string name="app_contributors">感謝以下貢獻者: <xliff:g id="app_contributors">%s</xliff:g></string>
     <string name="privacy_policy">隱私權政策</string>
     <plurals name="selectedCardCount">
-        <item quantity="other">已選取 <xliff:g>%d</xliff:g> 張卡片</item>
+        <item quantity="other">已選取 <xliff:g>%d</xliff:g></item>
     </plurals>
     <plurals name="deleteCardsTitle">
         <item quantity="other">刪除 <xliff:g>%d</xliff:g> 張卡片</item>
@@ -143,8 +144,8 @@
     <string name="share">分享</string>
     <string name="settings_system_theme">系統主題</string>
     <string name="settings_theme">主題</string>
-    <string name="thumbnailDescription">卡片縮圖</string>
-    <string name="noGroupCards">此群組中無任何卡片</string>
+    <string name="thumbnailDescription">縮圖</string>
+    <string name="noGroupCards">此群組為空</string>
     <string name="settings_category_title_ui">用戶界面</string>
     <string name="settings_max_font_size_scale">最大字體大小</string>
     <string name="settings_light_theme">淺色</string>
@@ -153,17 +154,17 @@
     <string name="settings_lock_barcode_orientation">鎖定條碼螢幕方向</string>
     <string name="settings_keep_screen_on">螢幕恆亮</string>
     <string name="settings_disable_lockscreen_while_viewing_card">防止螢幕鎖定</string>
-    <string name="importSuccessful">已匯入卡片資訊</string>
+    <string name="importSuccessful">已匯入資料</string>
     <string name="moveUp">往上移動</string>
     <string name="moveDown">往下移動</string>
     <string name="lockScreen">禁止旋轉</string>
     <string name="unlockScreen">允許旋轉</string>
     <string name="ok">OK</string>
     <string name="sendLabel">送出…</string>
-    <string name="scanCardBarcode">掃描卡片條碼</string>
+    <string name="scanCardBarcode">掃描條碼</string>
     <string name="noStoreError">尚未輸入卡片名稱</string>
-    <string name="importExportHelp">備份您的卡片以將這些卡片移至其他裝置中。</string>
-    <string name="noExternalStoragePermissionError">在匯入及匯出卡片前，請先允許外部儲存裝置存取權限</string>
+    <string name="importExportHelp">備份您的資料以將其轉移至其他裝置中。</string>
+    <string name="noExternalStoragePermissionError">在匯入及匯出資料前，請先允許外部儲存裝置存取權限</string>
     <string name="importOptionFilesystemTitle">自檔案系統中匯入</string>
     <string name="importOptionFilesystemExplanation">自檔案系統中選取檔案。</string>
     <string name="importOptionFilesystemButton">自檔案系統</string>
@@ -175,7 +176,7 @@
     <string name="importVoucherVaultMessage">選取您自 Voucher Vault 匯出的 <i>vouchervault.json</i> 檔案以進行匯入。
 \n請您先透過 Voucher Vault 進行匯出。</string>
     <string name="importStocard">自 Stocard 中匯入</string>
-    <string name="importStocardMessage">>選取您自 Stocard 匯出的  <i>***-sync.zip</i> 檔案以進行匯入。
+    <string name="importStocardMessage">&gt;選取您自 Stocard 匯出的  <i>***-sync.zip</i> 檔案以進行匯入。
 \n請您寫封 Email 至 support@stocardapp.com 索取您的資料。</string>
     <string name="importLoyaltyCardKeychain">自 Loyalty Card Keychain 中匯入</string>
     <string name="importLoyaltyCardKeychainMessage">選取您自 Loyalty Card Keychain <i>LoyaltyCardKeychain.csv</i> 檔案以進行匯入。
@@ -192,15 +193,37 @@
     <string name="app_libraries">第三方自由函示庫：<xliff:g id="app_libraries_list">%s</xliff:g></string>
     <string name="app_resources">第三方自由資源：<xliff:g id="app_resources_list">%s</xliff:g></string>
     <string name="selectBarcodeTitle">選擇條碼</string>
-    <string name="noGroups">請先點選 + 加號按鈕新增群組。</string>
+    <string name="noGroups">請點選 + 加號按鈕新增群組。</string>
     <string name="moveBarcodeToTopOfScreen">將條碼移至螢幕上方</string>
     <string name="moveBarcodeToCenterOfScreen">將條碼移至螢幕中央</string>
     <string name="app_loyalty_card_keychain">Loyalty Card Keychain</string>
     <string name="unsupportedBarcodeType">尚支援此條碼種類，但未來版本的應用程式可能會支援此條碼種類。</string>
     <string name="wrongValueForBarcodeType">條碼內容不適用於此條碼種類</string>
-    <string name="backImageDescription">卡片 (背面)</string>
-    <string name="updateBarcodeQuestionText">您已更新了條碼 ID，是否要更新條碼內容以匹配此 ID？</string>
+    <string name="backImageDescription">背面圖片</string>
+    <string name="updateBarcodeQuestionText">您已更新了 ID，是否要更新條碼內容以匹配此 ID？</string>
     <string name="failedGeneratingShareURL">無法建立可分享的 URL，請回報此錯誤。</string>
     <string name="swipeToSwitchImages">滑動或長按以切換圖片</string>
     <string name="starImage">收藏標示</string>
+    <string name="noGiftCardsGroup">建立一些卡片，然後將它們分配到這個群組中。</string>
+    <string name="showMoreInfo">顯示資訊</string>
+    <string name="hideMoreInfo">隱藏資訊</string>
+    <string name="action_show_details">顯示詳情</string>
+    <string name="shortcutSelectCard">選擇卡片</string>
+    <string name="starred">已收藏</string>
+    <plurals name="balancePoints">
+        <item quantity="other"><xliff:g>%s</xliff:g> 個點數</item>
+    </plurals>
+    <string name="selectColor">選擇顏色</string>
+    <string name="setIcon">設定圖示</string>
+    <string name="group_edit">編輯群組</string>
+    <string name="group_name_already_in_use">此群組名稱已存在</string>
+    <string name="group_name_is_empty">群組名稱不能為空</string>
+    <string name="group_updated">已更新群組</string>
+    <string name="editGroup">編輯群組中：<xliff:g>%s</xliff:g></string>
+    <string name="settings_oled_dark">使用深色主題時，使用純黑色背景</string>
+    <string name="action_hide_details">隱藏詳情</string>
+    <string name="translate_platform">於 Weblate</string>
+    <string name="options">選項</string>
+    <string name="set_scale">設定大小</string>
+    <string name="include_if_asking_support">如果您想請求協助，請附上以下訊息：</string>
 </resources>

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

@@ -1,26 +1,56 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Palette generated by Material IO https://material.io/color/#!/?view.left=0&view.right=0&primary.color=3F51B5&secondary.color=FFC107 -->
 <resources>
-    <color name="colorPrimary">#B53F3F</color>
-    <color name="colorPrimaryLight">#E87575</color>
-    <color name="colorPrimaryDark">#840000</color>
-    <color name="colorPrimaryDisabled">#484848</color>
-    <color name="colorSecondary">#ffc107</color>
-    <color name="colorSecondaryLight">#fff350</color>
-    <color name="colorSecondaryDark">#c79100</color>
-    <color name="colorPrimaryText">#ffffff</color>
-    <color name="colorSecondaryText">#000000</color>
-
-    <color name="listItemHighlight">#44000000</color>
-
-    <color name="inputContrastBackground">#F8F8F8</color>
-    <color name="inputBackground">#FFFFFF</color>
-    <color name="inputBorder">#DDDDDD</color>
-    <color name="inputDividerBorder">#AAAAAA</color>
-
-    <color name="iconColor">#000000</color>
-
-    <color name="alert">#FF0000</color>
-
-    <color name="mainLoyaltyCardBackground">#F8F8F8</color>
+    <color name="md_theme_light_primary">#A83536</color>
+    <color name="md_theme_light_onPrimary">#FFFFFF</color>
+    <color name="md_theme_light_primaryContainer">#FFDAD6</color>
+    <color name="md_theme_light_onPrimaryContainer">#410004</color>
+    <color name="md_theme_light_secondary">#775654</color>
+    <color name="md_theme_light_onSecondary">#FFFFFF</color>
+    <color name="md_theme_light_secondaryContainer">#FFDAD7</color>
+    <color name="md_theme_light_onSecondaryContainer">#2C1514</color>
+    <color name="md_theme_light_tertiary">#735A2E</color>
+    <color name="md_theme_light_onTertiary">#FFFFFF</color>
+    <color name="md_theme_light_tertiaryContainer">#FFDEA7</color>
+    <color name="md_theme_light_onTertiaryContainer">#281900</color>
+    <color name="md_theme_light_error">#BA1B1B</color>
+    <color name="md_theme_light_errorContainer">#FFDAD4</color>
+    <color name="md_theme_light_onError">#FFFFFF</color>
+    <color name="md_theme_light_onErrorContainer">#410001</color>
+    <color name="md_theme_light_background">#FCFCFC</color>
+    <color name="md_theme_light_onBackground">#201A1A</color>
+    <color name="md_theme_light_surface">#FCFCFC</color>
+    <color name="md_theme_light_onSurface">#201A1A</color>
+    <color name="md_theme_light_surfaceVariant">#F4DDDB</color>
+    <color name="md_theme_light_onSurfaceVariant">#524342</color>
+    <color name="md_theme_light_outline">#857372</color>
+    <color name="md_theme_light_inverseOnSurface">#FBEEEC</color>
+    <color name="md_theme_light_inverseSurface">#362F2E</color>
+    <color name="md_theme_light_primaryInverse">#FFB3AE</color>
+    <color name="md_theme_dark_primary">#FFB3AE</color>
+    <color name="md_theme_dark_onPrimary">#67020E</color>
+    <color name="md_theme_dark_primaryContainer">#881E22</color>
+    <color name="md_theme_dark_onPrimaryContainer">#FFDAD6</color>
+    <color name="md_theme_dark_secondary">#E7BDBA</color>
+    <color name="md_theme_dark_onSecondary">#442928</color>
+    <color name="md_theme_dark_secondaryContainer">#5D3F3D</color>
+    <color name="md_theme_dark_onSecondaryContainer">#FFDAD7</color>
+    <color name="md_theme_dark_tertiary">#E3C28C</color>
+    <color name="md_theme_dark_onTertiary">#402D05</color>
+    <color name="md_theme_dark_tertiaryContainer">#594319</color>
+    <color name="md_theme_dark_onTertiaryContainer">#FFDEA7</color>
+    <color name="md_theme_dark_error">#FFB4A9</color>
+    <color name="md_theme_dark_errorContainer">#930006</color>
+    <color name="md_theme_dark_onError">#680003</color>
+    <color name="md_theme_dark_onErrorContainer">#FFDAD4</color>
+    <color name="md_theme_dark_background">#201A1A</color>
+    <color name="md_theme_dark_onBackground">#ECDFDE</color>
+    <color name="md_theme_dark_surface">#201A1A</color>
+    <color name="md_theme_dark_onSurface">#ECDFDE</color>
+    <color name="md_theme_dark_surfaceVariant">#524342</color>
+    <color name="md_theme_dark_onSurfaceVariant">#D8C2C0</color>
+    <color name="md_theme_dark_outline">#A08C8B</color>
+    <color name="md_theme_dark_inverseOnSurface">#201A1A</color>
+    <color name="md_theme_dark_inverseSurface">#ECDFDE</color>
+    <color name="md_theme_dark_primaryInverse">#A83536</color>
+    <color name="seed">#B53F3F</color>
+    <color name="error">#BA1B1B</color>
 </resources>

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

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="app_revision_url" translatable="false">https://github.com/TheLastProject/Catima/releases</string>
-    <string name="app_webpage_url" translatable="false">https://github.com/TheLastProject/Catima</string>
+    <string name="app_revision_url" translatable="false">https://github.com/CatimaLoyalty/Android/releases</string>
+    <string name="app_webpage_url" translatable="false">https://github.com/CatimaLoyalty/Android</string>
     <integer name="full_rotation_duration">100</integer>
     <integer name="half_rotation_duration">50</integer>
 </resources>

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

@@ -13,6 +13,7 @@
     </string-array>
 
     <string-array name="color_values">
+        <item>@string/settings_key_system_theme</item>
         <item>@string/settings_key_catima_theme</item>
         <item>@string/settings_key_pink_theme</item>
         <item>@string/settings_key_magenta_theme</item>
@@ -20,11 +21,11 @@
         <item>@string/settings_key_blue_theme</item>
         <item>@string/settings_key_sky_blue_theme</item>
         <item>@string/settings_key_green_theme</item>
-        <item>@string/settings_key_grey_theme</item>
         <item>@string/settings_key_brown_theme</item>
     </string-array>
 
     <string-array name="color_value_strings">
+        <item>@string/settings_system_theme</item>
         <item>@string/settings_catima_theme</item>
         <item>@string/settings_pink_theme</item>
         <item>@string/settings_magenta_theme</item>
@@ -32,9 +33,29 @@
         <item>@string/settings_blue_theme</item>
         <item>@string/settings_sky_blue_theme</item>
         <item>@string/settings_green_theme</item>
-        <item>@string/settings_grey_theme</item>
         <item>@string/settings_brown_theme</item>
+    </string-array>
 
+    <string-array name="color_values_no_dynamic">
+        <item>@string/settings_key_system_theme</item>
+        <item>@string/settings_key_pink_theme</item>
+        <item>@string/settings_key_magenta_theme</item>
+        <item>@string/settings_key_violet_theme</item>
+        <item>@string/settings_key_blue_theme</item>
+        <item>@string/settings_key_sky_blue_theme</item>
+        <item>@string/settings_key_green_theme</item>
+        <item>@string/settings_key_brown_theme</item>
+    </string-array>
+
+    <string-array name="color_value_strings_no_dynamic">
+        <item>@string/settings_catima_theme</item>
+        <item>@string/settings_pink_theme</item>
+        <item>@string/settings_magenta_theme</item>
+        <item>@string/settings_violet_theme</item>
+        <item>@string/settings_blue_theme</item>
+        <item>@string/settings_sky_blue_theme</item>
+        <item>@string/settings_green_theme</item>
+        <item>@string/settings_brown_theme</item>
     </string-array>
 
     <string-array name="locale_values">

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

@@ -109,6 +109,7 @@
     <string name="settings_key_keep_screen_on" translatable="false">pref_keep_screen_on</string>
     <string name="settings_disable_lockscreen_while_viewing_card">Prevent screen lock</string>
     <string name="settings_key_disable_lockscreen_while_viewing_card" translatable="false">pref_disable_lockscreen_while_viewing_card</string>
+    <string name="settings_key_oled_dark" translatable="false">pref_oled_dark</string>
     <string name="sharedpreference_active_tab" translatable="false">sharedpreference_active_tab</string>
     <string name="sharedpreference_privacy_policy_shown" translatable="false">sharedpreference_privacy_policy_shown</string>
     <string name="sharedpreference_sort" translatable="false">sharedpreference_sort</string>
@@ -149,7 +150,10 @@
     <string name="expiryStateSentence">Expires: <xliff:g>%s</xliff:g></string>
     <string name="expiryStateSentenceExpired">Expired: <xliff:g>%s</xliff:g></string>
     <string name="balanceSentence">Balance: <xliff:g>%s</xliff:g></string>
-    <string name="balancePoints"><xliff:g>%s</xliff:g> points</string>
+    <plurals name="balancePoints">
+        <item quantity="one"><xliff:g>%s</xliff:g> point</item>
+        <item quantity="other"><xliff:g>%s</xliff:g> points</item>
+    </plurals>
     <string name="card">Card</string>
     <string name="barcode">Barcode</string>
     <string name="editBarcode">Edit barcode</string>
@@ -164,7 +168,7 @@
     <string name="currency">Currency</string>
     <string name="points">Points</string>
     <string name="parsingBalanceFailed"><xliff:g>%s</xliff:g> does not seem to be a valid balance.</string>
-    <string name="chooseImportType">Import data from?</string>
+    <string name="chooseImportType">Import data from</string>
     <string name="app_loyalty_card_keychain">Loyalty Card Keychain</string>
     <string name="privacy_policy">Privacy Policy</string>
     <string name="privacy_policy_popup_text">Privacy policy notice (required by some app stores):\n\nNO DATA IS COLLECTED AT ALL, which anyone can confirm since our app is libre software.</string>
@@ -209,6 +213,7 @@
     <string name="turn_flashlight_on">Turn flashlight on</string>
     <string name="turn_flashlight_off">Turn flashlight off</string>
     <string name="settings_locale">Language</string>
+    <string name="settings_oled_dark">Pure black background for dark theme</string>
     <string name="settings_key_locale" translatable="false">pref_locale</string>
     <string name="settings_system_locale">System</string>
     <string name="selectColor">Select color</string>
@@ -263,4 +268,5 @@
     <string name="options">Options</string>
     <string name="starred">Starred</string>
     <string name="set_scale">Set scale</string>
-</resources>
+    <string name="include_if_asking_support">If you want to request support, include the following info:</string>
+</resources>

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

@@ -1,155 +0,0 @@
-<resources>
-    <!-- Base application theme. -->
-    <style name="AppTheme" parent="Theme.MaterialComponents.DayNight.NoActionBar">
-        <!-- Customize your theme here. -->
-        <item name="colorPrimary">@color/colorPrimary</item>
-        <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
-        <item name="android:disabledAlpha">1.5</item>
-        <item name="colorSecondary">@color/colorSecondary</item>
-        <item name="colorAccent">@color/colorPrimary</item>
-        <item name="actionModeBackground">@color/colorPrimary</item>
-        <item name="windowActionModeOverlay">true</item>
-        <item name="actionModeCloseDrawable">@drawable/ic_close</item>
-    </style>
-
-    <style name="AppTheme_pink" parent="AppTheme">
-        <!-- Customize your theme here. -->
-        <item name="colorPrimary">@color/pink_colorPrimary</item>
-        <item name="colorPrimaryDark">@color/pink_colorPrimaryDark</item>
-        <item name="colorAccent">@color/pink_colorPrimary</item>
-        <item name="actionModeBackground">@color/pink_colorPrimary</item>
-    </style>
-
-    <style name="AppTheme_magenta" parent="AppTheme">
-        <!-- Customize your theme here. -->
-        <item name="colorPrimary">@color/magenta_colorPrimary</item>
-        <item name="colorPrimaryDark">@color/magenta_colorPrimaryDark</item>
-        <item name="colorAccent">@color/magenta_colorPrimary</item>
-        <item name="actionModeBackground">@color/magenta_colorPrimary</item>
-    </style>
-
-    <style name="AppTheme_violet" parent="AppTheme">
-        <!-- Customize your theme here. -->
-        <item name="colorPrimary">@color/violet_colorPrimary</item>
-        <item name="colorPrimaryDark">@color/violet_colorPrimaryDark</item>
-        <item name="colorAccent">@color/violet_colorPrimary</item>
-        <item name="actionModeBackground">@color/violet_colorPrimary</item>
-    </style>
-
-    <style name="AppTheme_blue" parent="AppTheme">
-        <!-- Customize your theme here. -->
-        <item name="colorPrimary">@color/blue_colorPrimary</item>
-        <item name="colorPrimaryDark">@color/blue_colorPrimaryDark</item>
-        <item name="colorAccent">@color/blue_colorPrimary</item>
-        <item name="actionModeBackground">@color/blue_colorPrimary</item>
-    </style>
-
-    <style name="AppTheme_sky_blue" parent="AppTheme">
-        <!-- Customize your theme here. -->
-        <item name="colorPrimary">@color/skyblue_colorPrimary</item>
-        <item name="colorPrimaryDark">@color/skyblue_colorPrimaryDark</item>
-        <item name="colorAccent">@color/skyblue_colorPrimary</item>
-        <item name="actionModeBackground">@color/skyblue_colorPrimary</item>
-    </style>
-
-    <style name="AppTheme_green" parent="AppTheme">
-        <!-- Customize your theme here. -->
-        <item name="colorPrimary">@color/green_colorPrimary</item>
-        <item name="colorPrimaryDark">@color/green_colorPrimaryDark</item>
-        <item name="colorAccent">@color/green_colorPrimary</item>
-        <item name="actionModeBackground">@color/green_colorPrimary</item>
-    </style>
-
-    <style name="AppTheme_grey" parent="AppTheme">
-        <!-- Customize your theme here. -->
-        <item name="colorPrimary">@color/grey_colorPrimary</item>
-        <item name="colorPrimaryDark">@color/grey_colorPrimaryDark</item>
-        <item name="colorAccent">@color/grey_colorPrimary</item>
-        <item name="actionModeBackground">@color/grey_colorPrimary</item>
-    </style>
-
-    <style name="AppTheme_brown" parent="AppTheme">
-        <!-- Customize your theme here. -->
-        <item name="colorPrimary">@color/brown_colorPrimary</item>
-        <item name="colorPrimaryDark">@color/brown_colorPrimaryDark</item>
-        <item name="colorAccent">@color/brown_colorPrimary</item>
-        <item name="actionModeBackground">@color/brown_colorPrimary</item>
-    </style>
-
-
-    <style name="AppTheme.NoActionBar" parent="AppTheme">
-        <item name="windowActionBar">false</item>
-        <item name="windowNoTitle">true</item>
-    </style>
-
-    <!--    Splash Screen Theme-->
-    <style name="Theme.App.Starting" parent="Theme.SplashScreen">
-
-        <item name="windowSplashScreenBackground">@color/ic_launcher_background</item>
-
-        <item name="windowSplashScreenAnimatedIcon">@drawable/ic_launcher_foreground</item>
-
-        <item name="postSplashScreenTheme">@style/AppTheme</item>
-    </style>
-
-    <style name="AppTheme.AppBarOverlay" parent="ThemeOverlay.MaterialComponents.Dark.ActionBar"/>
-
-    <style name="AppTheme.PopupOverlay" parent="ThemeOverlay.AppCompat.DayNight"/>
-
-    <style name="CardView.ActionBarTheme" parent="@style/ThemeOverlay.MaterialComponents.ActionBar">
-        <!-- THIS is where you can color the arrow! -->
-        <item name="colorControlNormal">@android:color/white</item>
-    </style>
-
-    <style name="AppTheme.TextView.NoData" parent="AppTheme">
-        <item name="android:layout_centerHorizontal">true</item>
-        <item name="android:layout_centerVertical">true</item>
-        <item name="android:padding">@dimen/no_data_padding</item>
-        <item name="android:textSize">@dimen/no_data_textSize</item>
-    </style>
-
-    <style name="AlertDialogTheme" parent="ThemeOverlay.MaterialComponents.Dialog.Alert">
-        <item name="buttonBarNegativeButtonStyle">@style/NegativeButtonStyle</item>
-        <item name="buttonBarPositiveButtonStyle">@style/PositiveButtonStyle</item>
-    </style>
-
-    <style name="NegativeButtonStyle" parent="Widget.MaterialComponents.Button.TextButton.Dialog">
-        <item name="android:textColor">@color/colorSecondaryText</item>
-    </style>
-
-    <style name="PositiveButtonStyle" parent="Widget.MaterialComponents.Button.TextButton.Dialog">
-        <item name="android:textColor">@color/colorSecondaryText</item>
-    </style>
-
-    <color name="red_colorPrimary">#ff0000</color>
-    <color name="red_colorPrimaryDark">#DF0000</color>
-
-    <color name="pink_colorPrimary">#e91e63</color>
-    <color name="pink_colorPrimaryDark">#CB1755</color>
-
-    <color name="magenta_colorPrimary">#9b26af</color>
-    <color name="magenta_colorPrimaryDark">#7a1ea1</color>
-
-    <color name="violet_colorPrimary">#6639b6</color>
-    <color name="violet_colorPrimaryDark">#502ca7</color>
-
-    <color name="blue_colorPrimary">#3F51B5</color>
-    <color name="blue_colorPrimaryDark">#3445A2</color>
-
-    <color name="skyblue_colorPrimary">#03A9F4</color>
-    <color name="skyblue_colorPrimaryDark">#0094D7</color>
-
-    <color name="green_colorPrimary">#4CAF50</color>
-    <color name="green_colorPrimaryDark">#419744</color>
-
-    <!--<color name="colorPrimary">#3F51B5</color>-->
-    <!--<color name="colorPrimaryDark">#3445A2</color>-->
-
-    <color name="grey_colorPrimary">#9d9d9d</color>
-    <color name="grey_colorPrimaryDark">#606060</color>
-    <color name="grey_colorAccent">#f90</color>
-
-    <color name="brown_colorPrimary">#795548</color>
-    <color name="brown_colorPrimaryDark">#63453B</color>
-    <color name="brown_colorAccent">#e81d62</color>
-</resources>

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

@@ -0,0 +1,259 @@
+<resources>
+
+    <style name="AppTheme" parent="Theme.Material3.Light.NoActionBar">
+        <item name="colorPrimary">@color/md_theme_light_primary</item>
+        <item name="colorOnPrimary">@color/md_theme_light_onPrimary</item>
+        <item name="colorPrimaryContainer">@color/md_theme_light_primaryContainer</item>
+        <item name="colorOnPrimaryContainer">@color/md_theme_light_onPrimaryContainer</item>
+        <item name="colorSecondary">@color/md_theme_light_secondary</item>
+        <item name="colorOnSecondary">@color/md_theme_light_onSecondary</item>
+        <item name="colorSecondaryContainer">@color/md_theme_light_secondaryContainer</item>
+        <item name="colorOnSecondaryContainer">@color/md_theme_light_onSecondaryContainer</item>
+        <item name="colorTertiary">@color/md_theme_light_tertiary</item>
+        <item name="colorOnTertiary">@color/md_theme_light_onTertiary</item>
+        <item name="colorTertiaryContainer">@color/md_theme_light_tertiaryContainer</item>
+        <item name="colorOnTertiaryContainer">@color/md_theme_light_onTertiaryContainer</item>
+        <item name="colorError">@color/md_theme_light_error</item>
+        <item name="colorErrorContainer">@color/md_theme_light_errorContainer</item>
+        <item name="colorOnError">@color/md_theme_light_onError</item>
+        <item name="colorOnErrorContainer">@color/md_theme_light_onErrorContainer</item>
+        <item name="android:colorBackground">@color/md_theme_light_background</item>
+        <item name="colorOnBackground">@color/md_theme_light_onBackground</item>
+        <item name="colorSurface">@color/md_theme_light_surface</item>
+        <item name="colorOnSurface">@color/md_theme_light_onSurface</item>
+        <item name="colorSurfaceVariant">@color/md_theme_light_surfaceVariant</item>
+        <item name="colorOnSurfaceVariant">@color/md_theme_light_onSurfaceVariant</item>
+        <item name="colorOutline">@color/md_theme_light_outline</item>
+        <item name="colorOnSurfaceInverse">@color/md_theme_light_inverseOnSurface</item>
+        <item name="colorSurfaceInverse">@color/md_theme_light_inverseSurface</item>
+        <item name="colorPrimaryInverse">@color/md_theme_light_primaryInverse</item>
+
+        <item name="windowActionModeOverlay">true</item>
+    </style>
+
+    <style name="AppTheme.NoActionBar" parent="AppTheme">
+        <item name="windowActionBar">false</item>
+        <item name="windowNoTitle">true</item>
+    </style>
+
+    <style name="AppTheme.TextView.NoData" parent="AppTheme">
+        <item name="android:layout_centerHorizontal">true</item>
+        <item name="android:layout_centerVertical">true</item>
+        <item name="android:padding">@dimen/no_data_padding</item>
+        <item name="android:textSize">@dimen/no_data_textSize</item>
+    </style>
+
+    <!-- Splash Screen Theme-->
+    <style name="Theme.App.Starting" parent="Theme.SplashScreen">
+        <item name="windowSplashScreenBackground">@color/ic_launcher_background</item>
+        <item name="windowSplashScreenAnimatedIcon">@drawable/ic_launcher_foreground</item>
+        <item name="postSplashScreenTheme">@style/AppTheme</item>
+    </style>
+
+    <!-- place holder for dark background night theme overrides -->
+    <style name="DarkBackground" />
+
+    <!-- color themes -->
+    <style name="pink">
+        <item name="colorPrimary">#BC0049</item>
+        <item name="colorOnPrimary">#FFFFFF</item>
+        <item name="colorPrimaryContainer">#FFD9DF</item>
+        <item name="colorOnPrimaryContainer">#400013</item>
+        <item name="colorSecondary">#76565B</item>
+        <item name="colorOnSecondary">#FFFFFF</item>
+        <item name="colorSecondaryContainer">#FFD9DE</item>
+        <item name="colorOnSecondaryContainer">#2B1519</item>
+        <item name="colorTertiary">#795831</item>
+        <item name="colorOnTertiary">#FFFFFF</item>
+        <item name="colorTertiaryContainer">#FFDDB8</item>
+        <item name="colorOnTertiaryContainer">#2C1700</item>
+        <item name="colorError">#BA1B1B</item>
+        <item name="colorErrorContainer">#FFDAD4</item>
+        <item name="colorOnError">#FFFFFF</item>
+        <item name="colorOnErrorContainer">#410001</item>
+        <item name="android:colorBackground">#FCFCFC</item>
+        <item name="colorOnBackground">#201A1B</item>
+        <item name="colorSurface">#FCFCFC</item>
+        <item name="colorOnSurface">#201A1B</item>
+        <item name="colorSurfaceVariant">#F4DDDF</item>
+        <item name="colorOnSurfaceVariant">#524345</item>
+        <item name="colorOutline">#847375</item>
+        <item name="colorOnSurfaceInverse">#FAEEEE</item>
+        <item name="colorSurfaceInverse">#362F30</item>
+        <item name="colorPrimaryInverse">#FFB2C0</item>
+    </style>
+
+    <style name="magenta">
+        <item name="colorPrimary">#9A25AE</item>
+        <item name="colorOnPrimary">#FFFFFF</item>
+        <item name="colorPrimaryContainer">#FFD5FF</item>
+        <item name="colorOnPrimaryContainer">#350040</item>
+        <item name="colorSecondary">#6B586B</item>
+        <item name="colorOnSecondary">#FFFFFF</item>
+        <item name="colorSecondaryContainer">#F5DBF2</item>
+        <item name="colorOnSecondaryContainer">#251626</item>
+        <item name="colorTertiary">#82524A</item>
+        <item name="colorOnTertiary">#FFFFFF</item>
+        <item name="colorTertiaryContainer">#FFDAD2</item>
+        <item name="colorOnTertiaryContainer">#32110C</item>
+        <item name="colorError">#BA1B1B</item>
+        <item name="colorErrorContainer">#FFDAD4</item>
+        <item name="colorOnError">#FFFFFF</item>
+        <item name="colorOnErrorContainer">#410001</item>
+        <item name="android:colorBackground">#FCFCFC</item>
+        <item name="colorOnBackground">#1E1A1D</item>
+        <item name="colorSurface">#FCFCFC</item>
+        <item name="colorOnSurface">#1E1A1D</item>
+        <item name="colorSurfaceVariant">#ECDEE8</item>
+        <item name="colorOnSurfaceVariant">#4D444C</item>
+        <item name="colorOutline">#7E747C</item>
+        <item name="colorOnSurfaceInverse">#F7EEF3</item>
+        <item name="colorSurfaceInverse">#332F32</item>
+        <item name="colorPrimaryInverse">#FBAAFF</item>
+    </style>
+
+    <style name="violet">
+        <item name="colorPrimary">#6F43BF</item>
+        <item name="colorOnPrimary">#FFFFFF</item>
+        <item name="colorPrimaryContainer">#ECDCFF</item>
+        <item name="colorOnPrimaryContainer">#25005B</item>
+        <item name="colorSecondary">#635B70</item>
+        <item name="colorOnSecondary">#FFFFFF</item>
+        <item name="colorSecondaryContainer">#E9DEF7</item>
+        <item name="colorOnSecondaryContainer">#1F182B</item>
+        <item name="colorTertiary">#7F525E</item>
+        <item name="colorOnTertiary">#FFFFFF</item>
+        <item name="colorTertiaryContainer">#FFD9E2</item>
+        <item name="colorOnTertiaryContainer">#32101B</item>
+        <item name="colorError">#BA1B1B</item>
+        <item name="colorErrorContainer">#FFDAD4</item>
+        <item name="colorOnError">#FFFFFF</item>
+        <item name="colorOnErrorContainer">#410001</item>
+        <item name="android:colorBackground">#FFFBFD</item>
+        <item name="colorOnBackground">#1D1B1F</item>
+        <item name="colorSurface">#FFFBFD</item>
+        <item name="colorOnSurface">#1D1B1F</item>
+        <item name="colorSurfaceVariant">#E7E0EB</item>
+        <item name="colorOnSurfaceVariant">#49454E</item>
+        <item name="colorOutline">#7A757F</item>
+        <item name="colorOnSurfaceInverse">#F5EFF4</item>
+        <item name="colorSurfaceInverse">#323033</item>
+        <item name="colorPrimaryInverse">#D4BAFF</item>
+    </style>
+
+    <style name="blue">
+        <item name="colorPrimary">#4355B9</item>
+        <item name="colorOnPrimary">#FFFFFF</item>
+        <item name="colorPrimaryContainer">#DDE0FF</item>
+        <item name="colorOnPrimaryContainer">#000D61</item>
+        <item name="colorSecondary">#5B5D71</item>
+        <item name="colorOnSecondary">#FFFFFF</item>
+        <item name="colorSecondaryContainer">#E0E1FA</item>
+        <item name="colorOnSecondaryContainer">#171A2C</item>
+        <item name="colorTertiary">#77536D</item>
+        <item name="colorOnTertiary">#FFFFFF</item>
+        <item name="colorTertiaryContainer">#FFD7F3</item>
+        <item name="colorOnTertiaryContainer">#2D1228</item>
+        <item name="colorError">#BA1B1B</item>
+        <item name="colorErrorContainer">#FFDAD4</item>
+        <item name="colorOnError">#FFFFFF</item>
+        <item name="colorOnErrorContainer">#410001</item>
+        <item name="android:colorBackground">#FEFBFF</item>
+        <item name="colorOnBackground">#1B1B1F</item>
+        <item name="colorSurface">#FEFBFF</item>
+        <item name="colorOnSurface">#1B1B1F</item>
+        <item name="colorSurfaceVariant">#E3E1EC</item>
+        <item name="colorOnSurfaceVariant">#46464F</item>
+        <item name="colorOutline">#767680</item>
+        <item name="colorOnSurfaceInverse">#F3F0F5</item>
+        <item name="colorSurfaceInverse">#303034</item>
+        <item name="colorPrimaryInverse">#B9C3FF</item>
+    </style>
+
+    <style name="skyblue">
+        <item name="colorPrimary">#006494</item>
+        <item name="colorOnPrimary">#FFFFFF</item>
+        <item name="colorPrimaryContainer">#C8E6FF</item>
+        <item name="colorOnPrimaryContainer">#001E31</item>
+        <item name="colorSecondary">#50606E</item>
+        <item name="colorOnSecondary">#FFFFFF</item>
+        <item name="colorSecondaryContainer">#D3E4F5</item>
+        <item name="colorOnSecondaryContainer">#0C1D29</item>
+        <item name="colorTertiary">#65597B</item>
+        <item name="colorOnTertiary">#FFFFFF</item>
+        <item name="colorTertiaryContainer">#ECDCFF</item>
+        <item name="colorOnTertiaryContainer">#201634</item>
+        <item name="colorError">#BA1B1B</item>
+        <item name="colorErrorContainer">#FFDAD4</item>
+        <item name="colorOnError">#FFFFFF</item>
+        <item name="colorOnErrorContainer">#410001</item>
+        <item name="android:colorBackground">#FCFCFF</item>
+        <item name="colorOnBackground">#1A1C1E</item>
+        <item name="colorSurface">#FCFCFF</item>
+        <item name="colorOnSurface">#1A1C1E</item>
+        <item name="colorSurfaceVariant">#DEE3EA</item>
+        <item name="colorOnSurfaceVariant">#41474D</item>
+        <item name="colorOutline">#72787E</item>
+        <item name="colorOnSurfaceInverse">#F0F0F3</item>
+        <item name="colorSurfaceInverse">#2F3032</item>
+        <item name="colorPrimaryInverse">#8BCEFF</item>
+    </style>
+
+    <style name="green">
+        <item name="colorPrimary">#006E17</item>
+        <item name="colorOnPrimary">#FFFFFF</item>
+        <item name="colorPrimaryContainer">#93F990</item>
+        <item name="colorOnPrimaryContainer">#002203</item>
+        <item name="colorSecondary">#52634F</item>
+        <item name="colorOnSecondary">#FFFFFF</item>
+        <item name="colorSecondaryContainer">#D5E8CE</item>
+        <item name="colorOnSecondaryContainer">#101F0F</item>
+        <item name="colorTertiary">#38656A</item>
+        <item name="colorOnTertiary">#FFFFFF</item>
+        <item name="colorTertiaryContainer">#BCEBF0</item>
+        <item name="colorOnTertiaryContainer">#001F23</item>
+        <item name="colorError">#BA1B1B</item>
+        <item name="colorErrorContainer">#FFDAD4</item>
+        <item name="colorOnError">#FFFFFF</item>
+        <item name="colorOnErrorContainer">#410001</item>
+        <item name="android:colorBackground">#FCFDF6</item>
+        <item name="colorOnBackground">#1A1C19</item>
+        <item name="colorSurface">#FCFDF6</item>
+        <item name="colorOnSurface">#1A1C19</item>
+        <item name="colorSurfaceVariant">#DEE5D8</item>
+        <item name="colorOnSurfaceVariant">#424840</item>
+        <item name="colorOutline">#73796F</item>
+        <item name="colorOnSurfaceInverse">#F0F1EB</item>
+        <item name="colorSurfaceInverse">#2F312D</item>
+        <item name="colorPrimaryInverse">#78DC77</item>
+    </style>
+
+    <style name="brown">
+        <item name="colorPrimary">#9A4523</item>
+        <item name="colorOnPrimary">#FFFFFF</item>
+        <item name="colorPrimaryContainer">#FFDBCD</item>
+        <item name="colorOnPrimaryContainer">#380C00</item>
+        <item name="colorSecondary">#77574C</item>
+        <item name="colorOnSecondary">#FFFFFF</item>
+        <item name="colorSecondaryContainer">#FFDBCD</item>
+        <item name="colorOnSecondaryContainer">#2C160D</item>
+        <item name="colorTertiary">#695E2F</item>
+        <item name="colorOnTertiary">#FFFFFF</item>
+        <item name="colorTertiaryContainer">#F1E2A7</item>
+        <item name="colorOnTertiaryContainer">#221B00</item>
+        <item name="colorError">#BA1B1B</item>
+        <item name="colorErrorContainer">#FFDAD4</item>
+        <item name="colorOnError">#FFFFFF</item>
+        <item name="colorOnErrorContainer">#410001</item>
+        <item name="android:colorBackground">#FCFCFC</item>
+        <item name="colorOnBackground">#201A18</item>
+        <item name="colorSurface">#FCFCFC</item>
+        <item name="colorOnSurface">#201A18</item>
+        <item name="colorSurfaceVariant">#F5DED6</item>
+        <item name="colorOnSurfaceVariant">#52433E</item>
+        <item name="colorOutline">#85736D</item>
+        <item name="colorOnSurfaceInverse">#FCEEEA</item>
+        <item name="colorSurfaceInverse">#362F2D</item>
+        <item name="colorPrimaryInverse">#FFB598</item>
+    </style>
+</resources>

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

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<PreferenceScreen
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto">
 
     <PreferenceCategory
@@ -8,30 +7,36 @@
         app:iconSpaceReserved="false">
 
         <ListPreference
-            android:key="@string/settings_key_theme"
-            android:title="@string/settings_theme"
             android:defaultValue="@string/settings_key_system_theme"
             android:entries="@array/theme_value_strings"
             android:entryValues="@array/theme_values"
+            android:key="@string/settings_key_theme"
+            android:title="@string/settings_theme"
             app:iconSpaceReserved="false"
             app:singleLineTitle="false" />
 
         <ListPreference
             android:key="@string/setting_key_theme_color"
             android:title="@string/settings_theme_color"
-            android:defaultValue="@string/settings_key_catima_theme"
+            android:defaultValue="@string/settings_key_system_theme"
             android:entries="@array/color_value_strings"
             android:entryValues="@array/color_values"
             app:iconSpaceReserved="false"
             app:singleLineTitle="false" />
 
+        <SwitchPreferenceCompat
+            android:defaultValue="false"
+            android:key="@string/settings_key_oled_dark"
+            android:title="@string/settings_oled_dark"
+            app:iconSpaceReserved="false"
+            app:singleLineTitle="false" />
 
         <ListPreference
-            android:key="@string/settings_key_locale"
-            android:title="@string/settings_locale"
             android:defaultValue=""
             android:entries="@array/locale_values"
             android:entryValues="@array/locale_values"
+            android:key="@string/settings_key_locale"
+            android:title="@string/settings_locale"
             app:iconSpaceReserved="false"
             app:singleLineTitle="false" />
 
@@ -39,11 +44,11 @@
             android:key="@string/settings_key_max_font_size_scale"
             android:title="@string/settings_max_font_size_scale"
             app:defaultValue="@integer/settings_max_font_size_scale_pct"
+            app:iconSpaceReserved="false"
             app:numberPickerPreference_maxValue="@integer/settings_max_font_size_scale_pct_max"
             app:numberPickerPreference_minValue="@integer/settings_max_font_size_scale_pct_min"
             app:numberPickerPreference_stepValue="10"
             app:numberPickerPreference_unitText="%"
-            app:iconSpaceReserved="false"
             app:singleLineTitle="false" />
 
         <SwitchPreferenceCompat

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

@@ -49,6 +49,7 @@ import androidx.core.content.res.ResourcesCompat;
 import protect.card_locker.async.TaskHandler;
 import protect.card_locker.importexport.DataFormat;
 import protect.card_locker.importexport.ImportExportResult;
+import protect.card_locker.importexport.ImportExportResultType;
 import protect.card_locker.importexport.MultiFormatExporter;
 import protect.card_locker.importexport.MultiFormatImporter;
 
@@ -324,7 +325,7 @@ public class ImportExportTest {
 
         // Export data to CSV format
         ImportExportResult result = MultiFormatExporter.exportData(activity.getApplicationContext(), mDatabase, outData, DataFormat.Catima, null);
-        assertEquals(ImportExportResult.Success, result);
+        assertEquals(ImportExportResultType.Success, result.resultType());
         outStream.close();
 
         TestHelpers.getEmptyDb(activity);
@@ -333,7 +334,7 @@ public class ImportExportTest {
 
         // Import the CSV data
         result = MultiFormatImporter.importData(activity.getApplicationContext(), mDatabase, inData, DataFormat.Catima, null);
-        assertEquals(ImportExportResult.Success, result);
+        assertEquals(ImportExportResultType.Success, result.resultType());
 
         assertEquals(NUM_CARDS, DBHelper.getLoyaltyCardCount(mDatabase));
 
@@ -354,7 +355,7 @@ public class ImportExportTest {
 
             // Export data to CSV format
             ImportExportResult result = MultiFormatExporter.exportData(activity.getApplicationContext(), mDatabase, outData, DataFormat.Catima, password);
-            assertEquals(ImportExportResult.Success, result);
+            assertEquals(ImportExportResultType.Success, result.resultType());
             outStream.close();
 
             TestHelpers.getEmptyDb(activity);
@@ -363,7 +364,7 @@ public class ImportExportTest {
 
             // Import the CSV data
             result = MultiFormatImporter.importData(activity.getApplicationContext(), mDatabase, inData, DataFormat.Catima, password);
-            assertEquals(ImportExportResult.Success, result);
+            assertEquals(ImportExportResultType.Success, result.resultType());
 
             assertEquals(NUM_CARDS, DBHelper.getLoyaltyCardCount(mDatabase));
 
@@ -386,7 +387,7 @@ public class ImportExportTest {
 
         // Export data to CSV format
         ImportExportResult result = MultiFormatExporter.exportData(activity.getApplicationContext(), mDatabase, outData, DataFormat.Catima, null);
-        assertEquals(ImportExportResult.Success, result);
+        assertEquals(ImportExportResultType.Success, result.resultType());
         outStream.close();
 
         TestHelpers.getEmptyDb(activity);
@@ -395,7 +396,7 @@ public class ImportExportTest {
 
         // Import the CSV data
         result = MultiFormatImporter.importData(activity.getApplicationContext(), mDatabase, inData, DataFormat.Catima, null);
-        assertEquals(ImportExportResult.Success, result);
+        assertEquals(ImportExportResultType.Success, result.resultType());
 
         assertEquals(NUM_CARDS, DBHelper.getLoyaltyCardCount(mDatabase));
 
@@ -457,7 +458,7 @@ public class ImportExportTest {
 
         // Export data to CSV format
         ImportExportResult result = MultiFormatExporter.exportData(activity.getApplicationContext(), mDatabase, outData, DataFormat.Catima, null);
-        assertEquals(ImportExportResult.Success, result);
+        assertEquals(ImportExportResultType.Success, result.resultType());
         outStream.close();
 
         TestHelpers.getEmptyDb(activity);
@@ -466,7 +467,7 @@ public class ImportExportTest {
 
         // Import the CSV data
         result = MultiFormatImporter.importData(activity.getApplicationContext(), mDatabase, inData, DataFormat.Catima, null);
-        assertEquals(ImportExportResult.Success, result);
+        assertEquals(ImportExportResultType.Success, result.resultType());
 
         assertEquals(NUM_CARDS, DBHelper.getLoyaltyCardCount(mDatabase));
         assertEquals(NUM_GROUPS, DBHelper.getGroupCount(mDatabase));
@@ -500,14 +501,14 @@ public class ImportExportTest {
 
         // Export into CSV data
         ImportExportResult result = MultiFormatExporter.exportData(activity.getApplicationContext(), mDatabase, outData, DataFormat.Catima, null);
-        assertEquals(ImportExportResult.Success, result);
+        assertEquals(ImportExportResultType.Success, result.resultType());
         outStream.close();
 
         ByteArrayInputStream inData = new ByteArrayInputStream(outData.toByteArray());
 
         // Import the CSV data on top of the existing database
         result = MultiFormatImporter.importData(activity.getApplicationContext(), mDatabase, inData, DataFormat.Catima, null);
-        assertEquals(ImportExportResult.Success, result);
+        assertEquals(ImportExportResultType.Success, result.resultType());
 
         assertEquals(NUM_CARDS, DBHelper.getLoyaltyCardCount(mDatabase));
 
@@ -529,7 +530,7 @@ public class ImportExportTest {
 
             // Export data to CSV format
             ImportExportResult result = MultiFormatExporter.exportData(activity.getApplicationContext(), mDatabase, outData, DataFormat.Catima, null);
-            assertEquals(ImportExportResult.Success, result);
+            assertEquals(ImportExportResultType.Success, result.resultType());
 
             TestHelpers.getEmptyDb(activity);
 
@@ -543,7 +544,7 @@ public class ImportExportTest {
 
             // Attempt to import the data
             result = MultiFormatImporter.importData(activity.getApplicationContext(), mDatabase, inData, format, null);
-            assertEquals(ImportExportResult.GenericFailure, result);
+            assertEquals(ImportExportResultType.GenericFailure, result.resultType());
 
             assertEquals(0, DBHelper.getLoyaltyCardCount(mDatabase));
 
@@ -586,7 +587,7 @@ public class ImportExportTest {
 
         // Check that the listener was executed
         assertNotNull(listener.result);
-        assertEquals(ImportExportResult.Success, listener.result);
+        assertEquals(ImportExportResultType.Success, listener.result.resultType());
 
         TestHelpers.getEmptyDb(activity);
 
@@ -607,7 +608,7 @@ public class ImportExportTest {
 
         // Check that the listener was executed
         assertNotNull(listener.result);
-        assertEquals(ImportExportResult.Success, listener.result);
+        assertEquals(ImportExportResultType.Success, listener.result.resultType());
 
         assertEquals(NUM_CARDS, DBHelper.getLoyaltyCardCount(mDatabase));
 
@@ -633,7 +634,7 @@ public class ImportExportTest {
 
         // Import the CSV data
         ImportExportResult result = MultiFormatImporter.importData(activity.getApplicationContext(), mDatabase, inputStream, DataFormat.Catima, null);
-        assertEquals(ImportExportResult.Success, result);
+        assertEquals(ImportExportResultType.Success, result.resultType());
         assertEquals(1, DBHelper.getLoyaltyCardCount(mDatabase));
 
         LoyaltyCard card = DBHelper.getLoyaltyCard(mDatabase, 1);
@@ -670,7 +671,7 @@ public class ImportExportTest {
 
         // Import the CSV data
         ImportExportResult result = MultiFormatImporter.importData(activity.getApplicationContext(), mDatabase, inputStream, DataFormat.Catima, null);
-        assertEquals(ImportExportResult.Success, result);
+        assertEquals(ImportExportResultType.Success, result.resultType());
         assertEquals(1, DBHelper.getLoyaltyCardCount(mDatabase));
 
         LoyaltyCard card = DBHelper.getLoyaltyCard(mDatabase, 1);
@@ -707,7 +708,7 @@ public class ImportExportTest {
 
         // Import the CSV data
         ImportExportResult result = MultiFormatImporter.importData(activity.getApplicationContext(), mDatabase, inputStream, DataFormat.Catima, null);
-        assertEquals(ImportExportResult.GenericFailure, result);
+        assertEquals(ImportExportResultType.GenericFailure, result.resultType());
         assertEquals(0, DBHelper.getLoyaltyCardCount(mDatabase));
 
         TestHelpers.getEmptyDb(activity);
@@ -731,7 +732,7 @@ public class ImportExportTest {
 
         // Import the CSV data
         ImportExportResult result = MultiFormatImporter.importData(activity.getApplicationContext(), mDatabase, inputStream, DataFormat.Catima, null);
-        assertEquals(ImportExportResult.Success, result);
+        assertEquals(ImportExportResultType.Success, result.resultType());
         assertEquals(1, DBHelper.getLoyaltyCardCount(mDatabase));
 
         LoyaltyCard card = DBHelper.getLoyaltyCard(mDatabase, 1);
@@ -768,7 +769,7 @@ public class ImportExportTest {
 
         // Import the CSV data
         ImportExportResult result = MultiFormatImporter.importData(activity.getApplicationContext(), mDatabase, inputStream, DataFormat.Catima, null);
-        assertEquals(ImportExportResult.Success, result);
+        assertEquals(ImportExportResultType.Success, result.resultType());
         assertEquals(1, DBHelper.getLoyaltyCardCount(mDatabase));
 
         LoyaltyCard card = DBHelper.getLoyaltyCard(mDatabase, 1);
@@ -805,7 +806,7 @@ public class ImportExportTest {
 
         // Import the CSV data
         ImportExportResult result = MultiFormatImporter.importData(activity.getApplicationContext(), mDatabase, inputStream, DataFormat.Catima, null);
-        assertEquals(ImportExportResult.Success, result);
+        assertEquals(ImportExportResultType.Success, result.resultType());
         assertEquals(1, DBHelper.getLoyaltyCardCount(mDatabase));
 
         LoyaltyCard card = DBHelper.getLoyaltyCard(mDatabase, 1);
@@ -842,7 +843,7 @@ public class ImportExportTest {
 
         // Import the CSV data
         ImportExportResult result = MultiFormatImporter.importData(activity.getApplicationContext(), mDatabase, inputStream, DataFormat.Catima, null);
-        assertEquals(ImportExportResult.Success, result);
+        assertEquals(ImportExportResultType.Success, result.resultType());
         assertEquals(1, DBHelper.getLoyaltyCardCount(mDatabase));
 
         csvText = "";
@@ -861,7 +862,7 @@ public class ImportExportTest {
 
         // Import the CSV data
         result = MultiFormatImporter.importData(activity.getApplicationContext(), mDatabase, inputStream, DataFormat.Catima, null);
-        assertEquals(ImportExportResult.Success, result);
+        assertEquals(ImportExportResultType.Success, result.resultType());
         assertEquals(1, DBHelper.getLoyaltyCardCount(mDatabase));
 
         LoyaltyCard card = DBHelper.getLoyaltyCard(mDatabase, 1);
@@ -1020,7 +1021,7 @@ public class ImportExportTest {
 
         // Import the CSV data
         ImportExportResult result = MultiFormatImporter.importData(activity.getApplicationContext(), mDatabase, inputStream, DataFormat.Catima, null);
-        assertEquals(ImportExportResult.Success, result);
+        assertEquals(ImportExportResultType.Success, result.resultType());
         assertEquals(7, DBHelper.getLoyaltyCardCount(mDatabase));
         assertEquals(3, DBHelper.getGroupCount(mDatabase));
 
@@ -1162,7 +1163,7 @@ public class ImportExportTest {
 
         // Import the Fidme data
         ImportExportResult result = MultiFormatImporter.importData(activity.getApplicationContext(), mDatabase, inputStream, DataFormat.Fidme, null);
-        assertEquals(ImportExportResult.Success, result);
+        assertEquals(ImportExportResultType.Success, result.resultType());
         assertEquals(3, DBHelper.getLoyaltyCardCount(mDatabase));
 
         LoyaltyCard card = DBHelper.getLoyaltyCard(mDatabase, 1);
@@ -1210,13 +1211,13 @@ public class ImportExportTest {
 
         // Import the Stocard data
         ImportExportResult result = MultiFormatImporter.importData(activity.getApplicationContext(), mDatabase, inputStream, DataFormat.Stocard, null);
-        assertEquals(ImportExportResult.BadPassword, result);
+        assertEquals(ImportExportResultType.BadPassword, result.resultType());
         assertEquals(0, DBHelper.getLoyaltyCardCount(mDatabase));
 
         inputStream = getClass().getResourceAsStream("stocard.zip");
 
         result = MultiFormatImporter.importData(activity.getApplicationContext(), mDatabase, inputStream, DataFormat.Stocard, "da811b40a4dac56f0cbb2d99b21bbb9a".toCharArray());
-        assertEquals(ImportExportResult.Success, result);
+        assertEquals(ImportExportResultType.Success, result.resultType());
         assertEquals(3, DBHelper.getLoyaltyCardCount(mDatabase));
 
         LoyaltyCard card = DBHelper.getLoyaltyCard(mDatabase, 1);
@@ -1302,7 +1303,7 @@ public class ImportExportTest {
 
         // Import the Voucher Vault data
         ImportExportResult result = MultiFormatImporter.importData(activity.getApplicationContext(), mDatabase, inputStream, DataFormat.VoucherVault, null);
-        assertEquals(ImportExportResult.Success, result);
+        assertEquals(ImportExportResultType.Success, result.resultType());
         assertEquals(2, DBHelper.getLoyaltyCardCount(mDatabase));
 
         LoyaltyCard card = DBHelper.getLoyaltyCard(mDatabase, 1);

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

@@ -313,6 +313,24 @@ public class LoyaltyCardViewActivityTest {
         }
     }
 
+    @Test
+    @Config(qualifiers="de")
+    public void noCrashOnRegionlessLocale() {
+        ActivityController activityController = Robolectric.buildActivity(LoyaltyCardEditActivity.class).create();
+
+        LoyaltyCardEditActivity activity = (LoyaltyCardEditActivity) activityController.get();
+        final Context context = activity.getApplicationContext();
+
+        activityController.start();
+        activityController.visible();
+        activityController.resume();
+
+        shadowOf(getMainLooper()).idle();
+
+        // Check default settings
+        checkAllFields(activity, ViewMode.ADD_CARD, "", "", context.getString(R.string.never), "0", context.getString(R.string.points), "", context.getString(R.string.sameAsCardId), context.getString(R.string.noBarcode), null, null);
+    }
+
     @Test
     public void noDataLossOnResumeOrRotate() {
         registerMediaStoreIntentHandler();