Release Catima 2.14.0

741: Material You redesign r=TheLastProject a=TheLastProject

I'm not super excited about the new dark theme's primary colour as generated by https://material-foundation.github.io/material-theme-builder/ for primary colour `#A83536` but alas...

![image](https://user-images.githubusercontent.com/1885159/149578453-72a6c345-e2ec-4271-9110-7ee39356b385.png)


Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Sylvia van Os <sylvia@hackerchick.me>

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## v2.14.0 - 99 (2022-01-14)
+
+- Material You redesign
+
 ## v2.13.1 - 98 (2022-01-09)
 
 - Fix various TalkBack-related bugs

app/build.gradle

@@ -18,8 +18,8 @@ android {
         applicationId "me.hackerchick.catima"
         minSdkVersion 21
         targetSdkVersion 31
-        versionCode 98
-        versionName "2.13.1"
+        versionCode 99
+        versionName "2.14.0"
 
         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.google.android.material:material:1.5.0'
     implementation 'com.github.yalantis:ucrop:2.2.7'
     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/java/protect/card_locker/CatimaAppCompatActivity.java

@@ -1,53 +1,13 @@
 package protect.card_locker;
 
 import android.content.Context;
-import android.content.SharedPreferences;
-import android.content.res.Resources;
-import android.util.TypedValue;
 
 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
         super.attachBaseContext(Utils.updateBaseContextLocale(base));
     }
-
-    @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);
-        }
-
-        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;
-    }
 }

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

@@ -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

@@ -327,8 +327,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()) {
@@ -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
@@ -692,13 +689,6 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity {
         );
     }
 
-    private void setCropperTheme() {
-        mCropperOptions.setToolbarColor(getThemeColor());
-        mCropperOptions.setStatusBarColor(getThemeColor());
-        mCropperOptions.setToolbarWidgetColor(Color.WHITE);
-        mCropperOptions.setActiveControlsWidgetColor(getThemeColor());
-    }
-
     @Override
     public void onNewIntent(Intent intent) {
         super.onNewIntent(intent);
@@ -910,7 +900,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");
         }

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;
@@ -49,7 +50,6 @@ import androidx.appcompat.widget.Toolbar;
 import androidx.constraintlayout.widget.ConstraintLayout;
 import androidx.constraintlayout.widget.Guideline;
 import androidx.coordinatorlayout.widget.CoordinatorLayout;
-import androidx.core.content.ContextCompat;
 import androidx.core.graphics.ColorUtils;
 import androidx.core.graphics.drawable.DrawableCompat;
 import androidx.core.widget.NestedScrollView;
@@ -285,9 +285,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 +527,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 +565,16 @@ public class LoyaltyCardViewActivity extends CatimaAppCompatActivity implements
         storeName.setTextColor(textColor);
         landscapeToolbar.setTitleTextColor(textColor);
 
+        // Also apply colours to buttons
+        int darkenedColor = ColorUtils.blendARGB(backgroundHeaderColor, Color.BLACK, 0.1f);
+        maximizeButton.setBackgroundColor(darkenedColor);
+        minimizeButton.setBackgroundColor(darkenedColor);
+        bottomSheetButton.setBackgroundColor(darkenedColor);
+        maximizeButton.setColorFilter(textColor);
+        minimizeButton.setColorFilter(textColor);
+        bottomSheetButton.setColorFilter(textColor);
+        editButton.setBackgroundTintList(ColorStateList.valueOf(Utils.getComplementaryColor(darkenedColor)));
+
         Bitmap icon = Utils.retrieveCardImage(this, loyaltyCard.id, ImageLocationType.icon);
         if (icon != null) {
             int backgroundAlphaColor = Utils.needsDarkForeground(backgroundHeaderColor) ? Color.WHITE : Color.BLACK;

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/Utils.java

@@ -448,4 +448,15 @@ 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);
+    }
 }

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

@@ -128,12 +128,6 @@ public class SettingsActivity extends CatimaAppCompatActivity {
                 return true;
             });
 
-            Preference 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;

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="@style/Widget.MaterialComponents.Toolbar.Primary" />
 
     </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="@style/Widget.MaterialComponents.Toolbar.Primary" />
 
             <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="@style/Widget.MaterialComponents.Toolbar.Primary" />
     </com.google.android.material.appbar.AppBarLayout>
 
     <LinearLayout

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

@@ -43,7 +43,6 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         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/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="@style/Widget.MaterialComponents.Toolbar.Primary" />
 
     </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="@style/Widget.MaterialComponents.Toolbar.Primary" />
 
         <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="@style/Widget.MaterialComponents.Toolbar.Primary" />
 
         <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="@style/Widget.MaterialComponents.Toolbar.Primary" />
 
     </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="@style/Widget.MaterialComponents.Toolbar.Primary" />
 
     </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

@@ -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="@style/Widget.MaterialComponents.Toolbar.Primary" />
 
     </com.google.android.material.appbar.AppBarLayout>
 

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="@style/Widget.MaterialComponents.Toolbar.Primary" />
 
     </com.google.android.material.appbar.AppBarLayout>
 

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,8 +25,8 @@
     </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>
@@ -34,9 +34,9 @@
     <string name="setFrontImage">Снимка на предната страна</string>
     <string name="photos">Снимки</string>
     <string name="importOptionApplicationExplanation">Изберете файл чрез друго приложение.</string>
-    <string name="noExternalStoragePermissionError">Дайте разрешение за достъп до хранилището, за да работи внасянето и изнасянето</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>
@@ -99,29 +99,29 @@
     <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="importSuccessful">Данните са внесени</string>
     <string name="chooseImportType">От къде ще внесете\?</string>
     <string name="importCatimaMessage">Изберете файла <i>catima.zip</i>, предварително изнесен от Catima.
 \nСъздайте такъв файл от меню Внасяне/изнасяне от друго устройство с Catima като изберете Изнасяне.</string>
@@ -139,12 +139,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,7 +162,7 @@
     <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="card_ids_copied">[не превеждайте този низ, https://github.com/TheLastProject/Catima/issues/278]</string>
     <string name="failedGeneratingShareURL">Грешка при създаване на адрес за споделяне. Изпратете доклад за дефект.</string>
     <string name="deleteTitle">Премахване на карта</string>
     <plurals name="deleteCardsTitle">
@@ -187,11 +187,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 +218,12 @@
     <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>
 </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="importFailed">Nelze provést import</string>
     <string name="exportSuccessfulTitle">Exportovat</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>
@@ -102,7 +102,7 @@
     <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 +121,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>
@@ -167,7 +167,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 +178,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 +191,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 +227,7 @@
     <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>
 </resources>

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

@@ -225,4 +225,5 @@
     <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>
 </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,33 @@
+<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>
+</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/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/settings.xml

@@ -12,31 +12,6 @@
         <item>@string/settings_dark_theme</item>
     </string-array>
 
-    <string-array name="color_values">
-        <item>@string/settings_key_catima_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_grey_theme</item>
-        <item>@string/settings_key_brown_theme</item>
-    </string-array>
-
-    <string-array name="color_value_strings">
-        <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_grey_theme</item>
-        <item>@string/settings_brown_theme</item>
-
-    </string-array>
-
     <string-array name="locale_values">
         <item />
         <item>bg</item>

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,51 @@
+<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>
+</resources>

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

@@ -16,16 +16,6 @@
             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:entries="@array/color_value_strings"
-            android:entryValues="@array/color_values"
-            app:iconSpaceReserved="false"
-            app:singleLineTitle="false" />
-
-
         <ListPreference
             android:key="@string/settings_key_locale"
             android:title="@string/settings_locale"

fastlane/metadata/android/cs_CZ/changelogs/92.txt

@@ -0,0 +1,2 @@
+- Nové rozvržení hlavní obrazovky
+- Oprava problémů s velikostí spodního panelu při přepínání na celou obrazovku a z ní

fastlane/metadata/android/cs_CZ/changelogs/93.txt

@@ -0,0 +1,2 @@
+- Přidání systému Catima do ovládacích prvků zařízení rychlého přístupu (https://developer.android.com/guide/topics/ui/device-control)
+- Oprava některých skupin, které se nezobrazují správně na obrazovce správy skupin

fastlane/metadata/android/cs_CZ/changelogs/94.txt

@@ -0,0 +1,3 @@
+- Oprava rozmazanosti ikon písmen na hlavní obrazovce
+- Oprava ikon, které někdy po výběru zmizí
+- Oprava možného zneviditelnění ikon na stavovém řádku v systému Android 5

fastlane/metadata/android/cs_CZ/changelogs/95.txt

@@ -0,0 +1 @@
+- Oprava pádu při sdílení karty

fastlane/metadata/android/cs_CZ/changelogs/96.txt

@@ -0,0 +1,2 @@
+- Přidání podpory kódu CODE 93
+- Různé drobné opravy a vylepšení

fastlane/metadata/android/cs_CZ/changelogs/97.txt

@@ -0,0 +1,4 @@
+- Opraveno vícenásobné stisknutí tlačítka pro uložení, které vytvořilo více záznamů.
+- Zmenšení velikosti záhlaví karty při skrývání detailů, aby se na kartu vešlo ještě více karet
+- Restrukturalizace obrazovky úprav
+- Zlepšení kontrastu ikony hvězdy v hlavním zobrazení

fastlane/metadata/android/cs_CZ/changelogs/98.txt

@@ -0,0 +1 @@
+- Oprava různých chyb souvisejících s TalkBack

fastlane/metadata/android/de-DE/changelogs/98.txt

@@ -0,0 +1 @@
+- Behebung verschiedener TalkBack-bezogener Fehler

fastlane/metadata/android/fr-FR/changelogs/12.txt

@@ -0,0 +1 @@
+-Empêche un plantage lors de la rotation de l'écran.

fastlane/metadata/android/fr-FR/changelogs/86.txt

@@ -0,0 +1 @@
+-Amélioration des recherches avec espaces

fastlane/metadata/android/fr-FR/changelogs/87.txt

@@ -0,0 +1 @@
+-Correction d'un bug import/export

fastlane/metadata/android/fr-FR/changelogs/88.txt

@@ -0,0 +1 @@
+-Correction d'un problème de migration qui rendait la première carte invisible

fastlane/metadata/android/fr-FR/changelogs/98.txt

@@ -0,0 +1 @@
+- Correction de divers bogues liés à TalkBack