Remove theme colour support

This simplifies the codebase and new Compose implementation. If this
feature is really wanted by the community, it could possibly be
reimplemented in a much more flexible way (choosing the exact colour)
after all UIs are migrated to Compose, as Compose can generate a theme
based on just a primary colour.

.github/dependabot.yml

@@ -9,10 +9,15 @@ updates:
       - mavenCentral
     schedule:
       interval: "daily"
+    cooldown:
+      default-days: 7
+  
   - package-ecosystem: "github-actions"
     directory: "/"
     schedule:
       interval: "weekly"
+    cooldown:
+      default-days: 7
 
 # Workaround for https://github.com/dependabot/dependabot-core/issues/6888
 registries:

.github/workflows/android.yml

@@ -64,7 +64,7 @@ jobs:
           script: ./gradlew connected${{ matrix.flavor }}DebugAndroidTest
       - name: Archive test results
         if: always()
-        uses: actions/upload-artifact@v5.0.0
+        uses: actions/upload-artifact@v6.0.0
         with:
           name: test-results-flavor${{ matrix.flavor }}
           path: app/build/reports

.github/workflows/changelog-to-fastlane.yml

@@ -27,7 +27,7 @@ jobs:
     - name: Run converter script
       run: python .scripts/changelog_to_fastlane.py
     - name: Create Pull Request
-      uses: peter-evans/create-pull-request@v7.0.11
+      uses: peter-evans/create-pull-request@v8.0.0
       with:
         title: "Update Fastlane changelogs"
         commit-message: "Update Fastlane changelogs"

.github/workflows/contributors-to-file.yml

@@ -25,7 +25,7 @@ jobs:
         file_in_repo: app/src/main/res/raw/contributors.txt
         min_commit_count: 5
     - name: Create Pull Request
-      uses: peter-evans/create-pull-request@v7.0.11
+      uses: peter-evans/create-pull-request@v8.0.0
       with:
         title: "Update contributors"
         commit-message: "Update contributors"

.github/workflows/generate-feature-graphic.yml

@@ -31,7 +31,7 @@ jobs:
     - name: Generate featureGraphic.png for each language
       run: .scripts/generate_feature_graphic/generate_feature_graphic.sh
     - name: Create Pull Request
-      uses: peter-evans/create-pull-request@v7.0.11
+      uses: peter-evans/create-pull-request@v8.0.0
       with:
         title: "Update feature graphic"
         commit-message: "Update feature graphic"

.github/workflows/update-locales.yml

@@ -23,7 +23,7 @@ jobs:
     - name: Update locales
       run: .scripts/locales.py
     - name: Create Pull Request
-      uses: peter-evans/create-pull-request@v7.0.11
+      uses: peter-evans/create-pull-request@v8.0.0
       with:
         title: "Update locales"
         commit-message: "Update locales"

.gitignore

@@ -19,8 +19,8 @@
 /app/*.log
 /app/build
 /app/release
-/.idea
-
+/.idea/*
+!/.idea/icon.svg
 # Bundle
 /.bundle/
 /vendor/bundle

.idea/icon.svg

@@ -0,0 +1 @@
+../.design/ic_launcher_foreground.svg

CHANGELOG.md

@@ -1,5 +1,12 @@
 # Changelog
 
+## Unreleased - 157
+
+- Add support for UTF-8 barcodes
+- Add duplicate option to main screen and reorder options slightly
+- Fix column count setting not being applied to group card list
+- Reduce max photo size to reduce storage use (only for newly added photos)
+
 ## v2.40.0 - 156 (2025-12-08)
 
 - Copy card ID to clipboard from view dialog or long press

app/build.gradle.kts

@@ -1,8 +1,10 @@
 import com.android.build.gradle.internal.tasks.factory.dependsOn
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 
 plugins {
     alias(libs.plugins.com.android.application)
     alias(libs.plugins.org.jetbrains.kotlin.android)
+    alias(libs.plugins.org.jetbrains.kotlin.plugin.compose)
 }
 
 kotlin {
@@ -47,6 +49,7 @@ android {
 
     buildFeatures {
         buildConfig = true
+        compose = true
         viewBinding = true
     }
 
@@ -74,16 +77,6 @@ android {
         }
     }
 
-    compileOptions {
-        encoding = "UTF-8"
-
-        // Flag to enable support for the new language APIs
-        isCoreLibraryDesugaringEnabled = true
-
-        sourceCompatibility = JavaVersion.VERSION_17
-        targetCompatibility = JavaVersion.VERSION_17
-    }
-
     sourceSets {
         getByName("test") {
             resources.srcDirs("src/test/res")
@@ -102,12 +95,21 @@ android {
     lint {
         lintConfig = file("lint.xml")
     }
-    kotlinOptions {
-        jvmTarget = "21"
+
+    kotlin {
+        compilerOptions {
+            jvmTarget = JvmTarget.JVM_17
+        }
     }
     compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_21
-        targetCompatibility = JavaVersion.VERSION_21
+        encoding = "UTF-8"
+
+        // Flag to enable support for the new language APIs
+        isCoreLibraryDesugaringEnabled = true
+
+
+        sourceCompatibility = JavaVersion.VERSION_17
+        targetCompatibility = JavaVersion.VERSION_17
     }
 }
 
@@ -124,6 +126,19 @@ dependencies {
     implementation(libs.com.google.android.material.material)
     coreLibraryDesugaring(libs.com.android.tools.desugar.jdk.libs)
 
+    // Compose
+    implementation(libs.androidx.activity.activity.compose)
+    val composeBom = platform(libs.androidx.compose.compose.bom)
+    implementation(composeBom)
+    implementation(libs.androidx.compose.foundation.foundation)
+    implementation(libs.androidx.compose.material3.material3)
+    implementation(libs.androidx.compose.material.material.icons.extended)
+    implementation(libs.androidx.compose.ui.ui.tooling.preview.android)
+    debugImplementation(libs.androidx.compose.ui.ui.test.manifest)
+
+    androidTestImplementation(composeBom)
+    androidTestImplementation(libs.androidx.compose.ui.ui.test.junit4)
+
     // Third-party
     implementation(libs.com.journeyapps.zxing.android.embedded)
     implementation(libs.com.github.yalantis.ucrop)
@@ -143,6 +158,8 @@ dependencies {
     androidTestImplementation(libs.bundles.androidx.test)
     androidTestImplementation(libs.junit.junit)
     androidTestImplementation(libs.androidx.test.ext.junit)
+    androidTestImplementation(libs.androidx.test.rules)
+    androidTestImplementation(libs.androidx.test.runner)
     androidTestImplementation(libs.androidx.test.uiautomator.uiautomator)
     androidTestImplementation(libs.androidx.test.espresso.espresso.core)
 }

app/src/androidTest/java/protect/card_locker/AboutActivityTest.kt

@@ -0,0 +1,89 @@
+package protect.card_locker
+
+import android.app.Instrumentation
+import androidx.compose.ui.test.ExperimentalTestApi
+import androidx.compose.ui.test.assertIsDisplayed
+import androidx.compose.ui.test.assertIsNotDisplayed
+import androidx.compose.ui.test.junit4.ComposeContentTestRule
+import androidx.compose.ui.test.junit4.createComposeRule
+import androidx.compose.ui.test.onNodeWithTag
+import androidx.compose.ui.test.onNodeWithText
+import androidx.compose.ui.test.performScrollTo
+import androidx.compose.ui.test.runComposeUiTest
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import androidx.test.platform.app.InstrumentationRegistry
+import org.junit.Rule
+import org.junit.Test
+import org.junit.runner.RunWith
+import protect.card_locker.compose.theme.CatimaTheme
+
+@OptIn(ExperimentalTestApi::class)
+@RunWith(AndroidJUnit4::class)
+class AboutActivityTest {
+    @get:Rule
+    private val rule: ComposeContentTestRule = createComposeRule()
+
+    private val instrumentation: Instrumentation = InstrumentationRegistry.getInstrumentation()
+
+    private val content: AboutContent = AboutContent(instrumentation.targetContext)
+
+    @Test
+    fun testInitialState(): Unit = runComposeUiTest {
+        setContent {
+            AboutScreenContent(content = content)
+        }
+
+        onNodeWithTag("topbar_catima").assertIsDisplayed()
+
+        onNodeWithTag("card_version_history").assertIsDisplayed()
+        onNodeWithText(content.versionHistory).assertIsDisplayed()
+
+        onNodeWithTag("card_credits").assertIsDisplayed()
+        onNodeWithText(content.copyrightShort).assertIsDisplayed()
+
+        onNodeWithTag("card_translate").assertIsDisplayed()
+        onNodeWithTag("card_license").assertIsDisplayed()
+
+        // We might be off the screen so start scrolling
+        onNodeWithTag("card_source_github").performScrollTo().assertIsDisplayed()
+        onNodeWithTag("card_privacy_policy").performScrollTo().assertIsDisplayed()
+        onNodeWithTag("card_donate").performScrollTo().assertIsDisplayed()
+        // Dont scroll to this, since its not displayed
+        onNodeWithTag("card_rate_google").assertIsNotDisplayed()
+        onNodeWithTag("card_report_error").performScrollTo().assertIsDisplayed()
+    }
+
+    @Test
+    fun testDonateAndGoogleCardVisible(): Unit = runComposeUiTest {
+        setContent {
+            CatimaTheme {
+                AboutScreenContent(
+                    content = content,
+                    showDonate = true,
+                    showRateOnGooglePlay = true,
+                )
+            }
+        }
+
+        onNodeWithTag("card_donate").performScrollTo().assertIsDisplayed()
+        onNodeWithTag("card_rate_google").performScrollTo().assertIsDisplayed()
+    }
+
+    @Test
+    fun testDonateAndGoogleCardHidden(): Unit = runComposeUiTest {
+        setContent {
+            CatimaTheme {
+                AboutScreenContent(
+                    content = content,
+                    showDonate = false,
+                    showRateOnGooglePlay = false,
+                )
+            }
+        }
+
+        onNodeWithTag("card_privacy_policy").performScrollTo().assertIsDisplayed()
+        onNodeWithTag("card_donate").assertIsNotDisplayed()
+        onNodeWithTag("card_rate_google").assertIsNotDisplayed()
+        onNodeWithTag("card_report_error").performScrollTo().assertIsDisplayed()
+    }
+}

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

@@ -1,149 +1,167 @@
 package protect.card_locker
 
 import android.os.Bundle
-import android.text.Spanned
-import android.view.MenuItem
-import android.view.View
-import android.widget.ScrollView
-import android.widget.TextView
+import androidx.activity.ComponentActivity
+import androidx.activity.OnBackPressedDispatcher
+import androidx.activity.compose.setContent
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.rememberScrollState
+import androidx.compose.foundation.verticalScroll
+import androidx.compose.material3.ExperimentalMaterial3Api
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Scaffold
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.platform.testTag
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.AnnotatedString
+import androidx.compose.ui.text.SpanStyle
+import androidx.compose.ui.text.TextLinkStyles
+import androidx.compose.ui.text.fromHtml
+import androidx.compose.ui.text.style.TextDecoration
+import androidx.compose.ui.tooling.preview.Preview
+import protect.card_locker.compose.CatimaAboutSection
+import protect.card_locker.compose.CatimaTopAppBar
+import protect.card_locker.compose.theme.CatimaTheme
 
-import androidx.annotation.StringRes
-import androidx.core.view.isVisible
-
-import com.google.android.material.dialog.MaterialAlertDialogBuilder
-
-import protect.card_locker.databinding.AboutActivityBinding
-
-class AboutActivity : CatimaAppCompatActivity() {
-    private companion object {
-        private const val TAG = "Catima"
-    }
-
-    private lateinit var binding: AboutActivityBinding
+class AboutActivity : ComponentActivity() {
     private lateinit var content: AboutContent
 
+    @OptIn(ExperimentalMaterial3Api::class)
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        binding = AboutActivityBinding.inflate(layoutInflater)
         content = AboutContent(this)
         title = content.pageTitle
-        setContentView(binding.root)
-        setSupportActionBar(binding.toolbar)
-        enableToolbarBackButton()
 
-        binding.apply {
-            creditsSub.text = content.copyrightShort
-            versionHistorySub.text = content.versionHistory
-
-            versionHistory.tag = "https://catima.app/changelog/"
-            translate.tag = "https://hosted.weblate.org/engage/catima/"
-            license.tag = "https://github.com/CatimaLoyalty/Android/blob/main/LICENSE"
-            repo.tag = "https://github.com/CatimaLoyalty/Android/"
-            privacy.tag = "https://catima.app/privacy-policy/"
-            reportError.tag = "https://github.com/CatimaLoyalty/Android/issues"
-            rate.tag = "https://play.google.com/store/apps/details?id=me.hackerchick.catima"
-            donate.tag = "https://catima.app/donate"
-
-            // Hide Google Play rate button if not on Google Play
-            rate.isVisible = BuildConfig.showRateOnGooglePlay
-            // Hide donate button on Google Play (Google Play doesn't allow donation links)
-            donate.isVisible = BuildConfig.showDonate
-        }
-
-        bindClickListeners()
-    }
-
-    override fun onOptionsItemSelected(item: MenuItem): Boolean {
-        return when (item.itemId) {
-            android.R.id.home -> {
-                finish()
-                true
+        setContent {
+            CatimaTheme {
+                AboutScreenContent(
+                    content = content,
+                    showDonate = BuildConfig.showDonate,
+                    showRateOnGooglePlay = BuildConfig.showRateOnGooglePlay,
+                    onBackPressedDispatcher = onBackPressedDispatcher
+                )
             }
-
-            else -> super.onOptionsItemSelected(item)
-        }
-    }
-
-    override fun onDestroy() {
-        super.onDestroy()
-        content.destroy()
-        clearClickListeners()
-    }
-
-    private fun bindClickListeners() {
-        binding.apply {
-            versionHistory.setOnClickListener { showHistory(it) }
-            translate.setOnClickListener { openExternalBrowser(it) }
-            license.setOnClickListener { showLicense(it) }
-            repo.setOnClickListener { openExternalBrowser(it) }
-            privacy.setOnClickListener { showPrivacy(it) }
-            reportError.setOnClickListener { openExternalBrowser(it) }
-            rate.setOnClickListener { openExternalBrowser(it) }
-            donate.setOnClickListener { openExternalBrowser(it) }
-            credits.setOnClickListener { showCredits() }
-        }
-    }
-
-    private fun clearClickListeners() {
-        binding.apply {
-            versionHistory.setOnClickListener(null)
-            translate.setOnClickListener(null)
-            license.setOnClickListener(null)
-            repo.setOnClickListener(null)
-            privacy.setOnClickListener(null)
-            reportError.setOnClickListener(null)
-            rate.setOnClickListener(null)
-            donate.setOnClickListener(null)
-            credits.setOnClickListener(null)
-        }
-    }
-
-    private fun showCredits() {
-        showHTML(R.string.credits, content.contributorInfo, null)
-    }
-
-    private fun showHistory(view: View) {
-        showHTML(R.string.version_history, content.historyInfo, view)
-    }
-
-    private fun showLicense(view: View) {
-        showHTML(R.string.license, content.licenseInfo, view)
-    }
-
-    private fun showPrivacy(view: View) {
-        showHTML(R.string.privacy_policy, content.privacyInfo, view)
-    }
-
-    private fun showHTML(@StringRes title: Int, text: Spanned, view: View?) {
-        val dialogContentPadding = resources.getDimensionPixelSize(R.dimen.alert_dialog_content_padding)
-        val textView = TextView(this).apply {
-            setText(text)
-            Utils.makeTextViewLinksClickable(this, text)
-        }
-
-        val scrollView = ScrollView(this).apply {
-            addView(textView)
-            setPadding(dialogContentPadding, dialogContentPadding / 2, dialogContentPadding, 0)
-        }
-
-        MaterialAlertDialogBuilder(this).apply {
-            setTitle(title)
-            setView(scrollView)
-            setPositiveButton(R.string.ok, null)
-
-            // Add View online button if an URL is linked to this view
-            view?.tag?.let {
-                setNeutralButton(R.string.view_online) { _, _ -> openExternalBrowser(view) }
-            }
-
-            show()
-        }
-    }
-
-    private fun openExternalBrowser(view: View) {
-        val tag = view.tag
-        if (tag is String && tag.startsWith("https://")) {
-            OpenWebLinkHandler().openBrowser(this, tag)
         }
     }
 }
+
+@Composable
+fun AboutScreenContent(
+    content: AboutContent,
+    showDonate: Boolean = true,
+    showRateOnGooglePlay: Boolean = false,
+    onBackPressedDispatcher: OnBackPressedDispatcher? = null,
+) {
+    Scaffold(
+        topBar = { CatimaTopAppBar(content.pageTitle.toString(), onBackPressedDispatcher) }
+    ) { innerPadding ->
+        Column(
+            modifier = Modifier
+                .padding(innerPadding)
+                .verticalScroll(rememberScrollState())
+        ) {
+            CatimaAboutSection(
+                stringResource(R.string.version_history),
+                content.versionHistory,
+                modifier = Modifier.testTag("card_version_history"),
+                onClickUrl = "https://catima.app/changelog/",
+                onClickDialogText = AnnotatedString.fromHtml(
+                    htmlString = content.historyHtml,
+                    linkStyles = TextLinkStyles(
+                        style = SpanStyle(
+                            textDecoration = TextDecoration.Underline,
+                            color = MaterialTheme.colorScheme.primary
+                        )
+                    )
+                )
+            )
+            CatimaAboutSection(
+                stringResource(R.string.credits),
+                content.copyrightShort,
+                modifier = Modifier.testTag("card_credits"),
+                onClickDialogText = AnnotatedString.fromHtml(
+                    htmlString = content.contributorInfoHtml,
+                    linkStyles = TextLinkStyles(
+                        style = SpanStyle(
+                            textDecoration = TextDecoration.Underline,
+                            color = MaterialTheme.colorScheme.primary
+                        )
+                    )
+                )
+            )
+            CatimaAboutSection(
+                stringResource(R.string.help_translate_this_app),
+                stringResource(R.string.translate_platform),
+                modifier = Modifier.testTag("card_translate"),
+                onClickUrl = "https://hosted.weblate.org/engage/catima/"
+            )
+            CatimaAboutSection(
+                stringResource(R.string.license),
+                stringResource(R.string.app_license),
+                modifier = Modifier.testTag("card_license"),
+                onClickUrl = "https://github.com/CatimaLoyalty/Android/blob/main/LICENSE",
+                onClickDialogText = AnnotatedString.fromHtml(
+                    htmlString = content.licenseHtml,
+                    linkStyles = TextLinkStyles(
+                        style = SpanStyle(
+                            textDecoration = TextDecoration.Underline,
+                            color = MaterialTheme.colorScheme.primary
+                        )
+                    )
+                )
+            )
+            CatimaAboutSection(
+                stringResource(R.string.source_repository),
+                stringResource(R.string.on_github),
+                modifier = Modifier.testTag("card_source_github"),
+                onClickUrl = "https://github.com/CatimaLoyalty/Android/"
+            )
+            CatimaAboutSection(
+                stringResource(R.string.privacy_policy),
+                stringResource(R.string.and_data_usage),
+                modifier = Modifier.testTag("card_privacy_policy"),
+                onClickUrl = "https://catima.app/privacy-policy/",
+                onClickDialogText = AnnotatedString.fromHtml(
+                    htmlString = content.privacyHtml,
+                    linkStyles = TextLinkStyles(
+                        style = SpanStyle(
+                            textDecoration = TextDecoration.Underline,
+                            color = MaterialTheme.colorScheme.primary
+                        )
+                    )
+                )
+            )
+            if (showDonate) {
+                CatimaAboutSection(
+                    stringResource(R.string.donate),
+                    "",
+                    modifier = Modifier.testTag("card_donate"),
+                    onClickUrl = "https://catima.app/donate"
+                )
+            }
+            if (showRateOnGooglePlay) {
+                CatimaAboutSection(
+                    stringResource(R.string.rate_this_app),
+                    stringResource(R.string.on_google_play),
+                    modifier = Modifier.testTag("card_rate_google"),
+                    onClickUrl = "https://play.google.com/store/apps/details?id=me.hackerchick.catima"
+                )
+            }
+            CatimaAboutSection(
+                stringResource(R.string.report_error),
+                stringResource(R.string.on_github),
+                modifier = Modifier.testTag("card_report_error"),
+                onClickUrl = "https://github.com/CatimaLoyalty/Android/issues"
+            )
+        }
+    }
+}
+
+@Preview
+@Composable
+private fun AboutActivityPreview() {
+    AboutScreenContent(AboutContent(LocalContext.current))
+}

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

@@ -3,11 +3,8 @@ package protect.card_locker;
 import android.content.Context;
 import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager;
-import android.text.Spanned;
 import android.util.Log;
 
-import androidx.core.text.HtmlCompat;
-
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Calendar;
@@ -55,7 +52,7 @@ public class AboutContent {
         return context.getString(R.string.app_copyright_short);
     }
 
-    public String getContributors() {
+    public String getContributorsHtml() {
         String contributors;
         try {
             contributors = "<br/>" + Utils.readTextFile(context, R.raw.contributors);
@@ -65,7 +62,7 @@ public class AboutContent {
         return contributors.replace("\n", "<br />");
     }
 
-    public String getHistory() {
+    public String getHistoryHtml() {
         String versionHistory;
         try {
             versionHistory = Utils.readTextFile(context, R.raw.changelog)
@@ -77,7 +74,7 @@ public class AboutContent {
                 .replace("\n", "<br />");
     }
 
-    public String getLicense() {
+    public String getLicenseHtml() {
         try {
             return Utils.readTextFile(context, R.raw.license);
         }  catch (IOException ignored) {
@@ -85,7 +82,7 @@ public class AboutContent {
         }
     }
 
-    public String getPrivacy() {
+    public String getPrivacyHtml() {
         String privacyPolicy;
         try {
             privacyPolicy = Utils.readTextFile(context, R.raw.privacy)
@@ -97,7 +94,7 @@ public class AboutContent {
                 .replace("\n", "<br />");
     }
 
-    public String getThirdPartyLibraries() {
+    public String getThirdPartyLibrariesHtml() {
         final List<ThirdPartyInfo> usedLibraries = new ArrayList<>();
         usedLibraries.add(new ThirdPartyInfo("ACRA", "https://github.com/ACRA/acra", "Apache 2.0"));
         usedLibraries.add(new ThirdPartyInfo("Color Picker", "https://github.com/jaredrummler/ColorPicker", "Apache 2.0"));
@@ -116,7 +113,7 @@ public class AboutContent {
         return result.toString();
     }
 
-    public String getUsedThirdPartyAssets() {
+    public String getUsedThirdPartyAssetsHtml() {
         final List<ThirdPartyInfo> usedAssets = new ArrayList<>();
         usedAssets.add(new ThirdPartyInfo("Android icons", "https://fonts.google.com/icons?selected=Material+Icons", "Apache 2.0"));
 
@@ -129,31 +126,19 @@ public class AboutContent {
         return result.toString();
     }
 
-    public Spanned getContributorInfo() {
+    public String getContributorInfoHtml() {
         StringBuilder contributorInfo = new StringBuilder();
         contributorInfo.append(getCopyright());
         contributorInfo.append("<br/><br/>");
         contributorInfo.append(context.getString(R.string.app_copyright_old));
         contributorInfo.append("<br/><br/>");
-        contributorInfo.append(String.format(context.getString(R.string.app_contributors), getContributors()));
+        contributorInfo.append(String.format(context.getString(R.string.app_contributors), getContributorsHtml()));
         contributorInfo.append("<br/><br/>");
-        contributorInfo.append(String.format(context.getString(R.string.app_libraries), getThirdPartyLibraries()));
+        contributorInfo.append(String.format(context.getString(R.string.app_libraries), getThirdPartyLibrariesHtml()));
         contributorInfo.append("<br/><br/>");
-        contributorInfo.append(String.format(context.getString(R.string.app_resources), getUsedThirdPartyAssets()));
+        contributorInfo.append(String.format(context.getString(R.string.app_resources), getUsedThirdPartyAssetsHtml()));
 
-        return HtmlCompat.fromHtml(contributorInfo.toString(), HtmlCompat.FROM_HTML_MODE_COMPACT);
-    }
-
-    public Spanned getHistoryInfo() {
-        return HtmlCompat.fromHtml(getHistory(), HtmlCompat.FROM_HTML_MODE_COMPACT);
-    }
-
-    public Spanned getLicenseInfo() {
-        return HtmlCompat.fromHtml(getLicense(), HtmlCompat.FROM_HTML_MODE_LEGACY);
-    }
-
-    public Spanned getPrivacyInfo() {
-        return HtmlCompat.fromHtml(getPrivacy(), HtmlCompat.FROM_HTML_MODE_COMPACT);
+        return contributorInfo.toString();
     }
 
     public String getVersionHistory() {

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

@@ -4,17 +4,24 @@ import android.content.Context;
 import android.graphics.Bitmap;
 import android.graphics.Color;
 import android.graphics.PorterDuff;
+import android.util.ArrayMap;
 import android.util.Log;
 import android.util.TypedValue;
 import android.view.View;
 import android.widget.ImageView;
 import android.widget.TextView;
 
+import androidx.annotation.Nullable;
+
+import com.google.zxing.EncodeHintType;
 import com.google.zxing.MultiFormatWriter;
 import com.google.zxing.WriterException;
 import com.google.zxing.common.BitMatrix;
+import com.google.zxing.common.StringUtils;
 
 import java.lang.ref.WeakReference;
+import java.nio.charset.Charset;
+import java.util.Map;
 
 import protect.card_locker.async.CompatCallable;
 
@@ -39,6 +46,7 @@ public class BarcodeImageWriterTask implements CompatCallable<Bitmap> {
     private final WeakReference<TextView> textViewReference;
     private String cardId;
     private final CatimaBarcode format;
+    private final Charset encoding;
     private final int imageHeight;
     private final int imageWidth;
     private final int imagePadding;
@@ -48,7 +56,7 @@ public class BarcodeImageWriterTask implements CompatCallable<Bitmap> {
 
     BarcodeImageWriterTask(
             Context context, ImageView imageView, String cardIdString,
-            CatimaBarcode barcodeFormat, TextView textView,
+            CatimaBarcode barcodeFormat, @Nullable Charset barcodeEncoding, TextView textView,
             boolean showFallback, BarcodeImageWriterResultCallback callback, boolean roundCornerPadding, boolean isFullscreen
     ) {
         mContext = context;
@@ -62,6 +70,7 @@ public class BarcodeImageWriterTask implements CompatCallable<Bitmap> {
 
         cardId = cardIdString;
         format = barcodeFormat;
+        encoding = barcodeEncoding;
 
         int imageViewHeight = imageView.getHeight();
         int imageViewWidth = imageView.getWidth();
@@ -172,10 +181,22 @@ public class BarcodeImageWriterTask implements CompatCallable<Bitmap> {
         }
 
         MultiFormatWriter writer = new MultiFormatWriter();
+
+        Map<EncodeHintType, Object> encodeHints = new ArrayMap<>();
+        // Use charset if defined or guess otherwise
+        if (encoding != null) {
+            Log.d(TAG, "Encoding explicitly set, " + encoding.name());
+            encodeHints.put(EncodeHintType.CHARACTER_SET, encoding);
+        } else {
+            String guessedEncoding = StringUtils.guessEncoding(cardId.getBytes(), new ArrayMap<>());
+            Log.d(TAG, "Guessed encoding: " + guessedEncoding);
+            encodeHints.put(EncodeHintType.CHARACTER_SET, Charset.forName(guessedEncoding));
+        }
+
         BitMatrix bitMatrix;
         try {
             try {
-                bitMatrix = writer.encode(cardId, format.format(), imageWidth, imageHeight, null);
+                bitMatrix = writer.encode(cardId, format.format(), imageWidth, imageHeight, encodeHints);
             } catch (Exception e) {
                 // Cast a wider net here and catch any exception, as there are some
                 // cases where an encoder may fail if the data is invalid for the

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

@@ -92,13 +92,13 @@ public class BarcodeSelectorAdapter extends ArrayAdapter<CatimaBarcodeWithValue>
 
                             Log.d(TAG, "Generating barcode for type " + formatType);
 
-                            BarcodeImageWriterTask barcodeWriter = new BarcodeImageWriterTask(getContext(), image, cardId, format, text, true, null, true, false);
+                            BarcodeImageWriterTask barcodeWriter = new BarcodeImageWriterTask(getContext(), image, cardId, format, null, text, true, null, true, false);
                             mTasks.executeTask(TaskHandler.TYPE.BARCODE, barcodeWriter);
                         }
                     });
         } else {
             Log.d(TAG, "Generating barcode for type " + formatType);
-            BarcodeImageWriterTask barcodeWriter = new BarcodeImageWriterTask(getContext(), image, cardId, format, text, true, null, true, false);
+            BarcodeImageWriterTask barcodeWriter = new BarcodeImageWriterTask(getContext(), image, cardId, format, null, text, true, null, true, false);
             mTasks.executeTask(TaskHandler.TYPE.BARCODE, barcodeWriter);
         }
     }

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

@@ -10,8 +10,11 @@ import android.database.sqlite.SQLiteOpenHelper;
 import android.text.TextUtils;
 import android.util.Log;
 
+import androidx.annotation.Nullable;
+
 import java.io.FileNotFoundException;
 import java.math.BigDecimal;
+import java.nio.charset.Charset;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Currency;
@@ -23,7 +26,7 @@ import java.util.Set;
 public class DBHelper extends SQLiteOpenHelper {
     public static final String DATABASE_NAME = "Catima.db";
     public static final int ORIGINAL_DATABASE_VERSION = 1;
-    public static final int DATABASE_VERSION = 17;
+    public static final int DATABASE_VERSION = 18;
 
     // NB: changing these values requires a migration
     public static final int DEFAULT_ZOOM_LEVEL = 100;
@@ -49,6 +52,7 @@ public class DBHelper extends SQLiteOpenHelper {
         public static final String CARD_ID = "cardid";
         public static final String BARCODE_ID = "barcodeid";
         public static final String BARCODE_TYPE = "barcodetype";
+        public static final String BARCODE_ENCODING = "barcodeencoding";
         public static final String STAR_STATUS = "starstatus";
         public static final String LAST_USED = "lastused";
         public static final String ZOOM_LEVEL = "zoomlevel";
@@ -112,6 +116,7 @@ public class DBHelper extends SQLiteOpenHelper {
                 LoyaltyCardDbIds.CARD_ID + " TEXT not null," +
                 LoyaltyCardDbIds.BARCODE_ID + " TEXT," +
                 LoyaltyCardDbIds.BARCODE_TYPE + " TEXT," +
+                LoyaltyCardDbIds.BARCODE_ENCODING + " TEXT," +
                 LoyaltyCardDbIds.STAR_STATUS + " INTEGER DEFAULT '0'," +
                 LoyaltyCardDbIds.LAST_USED + " INTEGER DEFAULT '0', " +
                 LoyaltyCardDbIds.ZOOM_LEVEL + " INTEGER DEFAULT '" + DEFAULT_ZOOM_LEVEL + "', " +
@@ -335,6 +340,11 @@ public class DBHelper extends SQLiteOpenHelper {
             db.execSQL("ALTER TABLE " + LoyaltyCardDbIds.TABLE
                     + " ADD COLUMN " + LoyaltyCardDbIds.ZOOM_LEVEL_WIDTH + " INTEGER DEFAULT '100' ");
         }
+
+        if (oldVersion < 18 && newVersion >= 18) {
+            db.execSQL("ALTER TABLE " + LoyaltyCardDbIds.TABLE
+                    + " ADD COLUMN " + LoyaltyCardDbIds.BARCODE_ENCODING + " TEXT");
+        }
     }
 
     public static Set<String> imageFiles(Context context, final SQLiteDatabase database) {
@@ -396,7 +406,8 @@ public class DBHelper extends SQLiteOpenHelper {
     public static long insertLoyaltyCard(
             final SQLiteDatabase database, final String store, final String note, final Date validFrom,
             final Date expiry, final BigDecimal balance, final Currency balanceType, final String cardId,
-            final String barcodeId, final CatimaBarcode barcodeType, final Integer headerColor,
+            final String barcodeId, final CatimaBarcode barcodeType, final @Nullable Charset barcodeEncoding,
+            final Integer headerColor,
             final int starStatus, final Long lastUsed, final int archiveStatus) {
         database.beginTransaction();
 
@@ -411,6 +422,7 @@ public class DBHelper extends SQLiteOpenHelper {
         contentValues.put(LoyaltyCardDbIds.CARD_ID, cardId);
         contentValues.put(LoyaltyCardDbIds.BARCODE_ID, barcodeId);
         contentValues.put(LoyaltyCardDbIds.BARCODE_TYPE, barcodeType != null ? barcodeType.name() : null);
+        contentValues.put(LoyaltyCardDbIds.BARCODE_ENCODING, barcodeEncoding != null ? barcodeEncoding.name() : null);
         contentValues.put(LoyaltyCardDbIds.HEADER_COLOR, headerColor);
         contentValues.put(LoyaltyCardDbIds.STAR_STATUS, starStatus);
         contentValues.put(LoyaltyCardDbIds.LAST_USED, lastUsed != null ? lastUsed : Utils.getUnixTime());
@@ -430,7 +442,8 @@ public class DBHelper extends SQLiteOpenHelper {
             final SQLiteDatabase database, final int id, final String store, final String note,
             final Date validFrom, final Date expiry, final BigDecimal balance,
             final Currency balanceType, final String cardId, final String barcodeId,
-            final CatimaBarcode barcodeType, final Integer headerColor, final int starStatus,
+            final CatimaBarcode barcodeType, final @Nullable Charset barcodeEncoding,
+            final Integer headerColor, final int starStatus,
             final Long lastUsed, final int archiveStatus) {
         database.beginTransaction();
 
@@ -446,6 +459,7 @@ public class DBHelper extends SQLiteOpenHelper {
         contentValues.put(LoyaltyCardDbIds.CARD_ID, cardId);
         contentValues.put(LoyaltyCardDbIds.BARCODE_ID, barcodeId);
         contentValues.put(LoyaltyCardDbIds.BARCODE_TYPE, barcodeType != null ? barcodeType.name() : null);
+        contentValues.put(LoyaltyCardDbIds.BARCODE_ENCODING, barcodeEncoding != null ? barcodeEncoding.name() : null);
         contentValues.put(LoyaltyCardDbIds.HEADER_COLOR, headerColor);
         contentValues.put(LoyaltyCardDbIds.STAR_STATUS, starStatus);
         contentValues.put(LoyaltyCardDbIds.LAST_USED, lastUsed != null ? lastUsed : Utils.getUnixTime());
@@ -465,7 +479,8 @@ public class DBHelper extends SQLiteOpenHelper {
             SQLiteDatabase database, final int id, final String store, final String note,
             final Date validFrom, final Date expiry, final BigDecimal balance,
             final Currency balanceType, final String cardId, final String barcodeId,
-            final CatimaBarcode barcodeType, final Integer headerColor, final int starStatus,
+            final CatimaBarcode barcodeType, final @Nullable Charset barcodeEncoding,
+            final Integer headerColor, final int starStatus,
             final Long lastUsed, final int archiveStatus) {
         database.beginTransaction();
 
@@ -480,6 +495,7 @@ public class DBHelper extends SQLiteOpenHelper {
         contentValues.put(LoyaltyCardDbIds.CARD_ID, cardId);
         contentValues.put(LoyaltyCardDbIds.BARCODE_ID, barcodeId);
         contentValues.put(LoyaltyCardDbIds.BARCODE_TYPE, barcodeType != null ? barcodeType.name() : null);
+        contentValues.put(LoyaltyCardDbIds.BARCODE_ENCODING, barcodeEncoding != null ? barcodeEncoding.name() : null);
         contentValues.put(LoyaltyCardDbIds.HEADER_COLOR, headerColor);
         contentValues.put(LoyaltyCardDbIds.STAR_STATUS, starStatus);
         contentValues.put(LoyaltyCardDbIds.LAST_USED, lastUsed != null ? lastUsed : Utils.getUnixTime());

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

@@ -4,11 +4,14 @@ import android.content.Context;
 import android.content.Intent;
 import android.net.Uri;
 
+import androidx.annotation.Nullable;
+
 import java.io.InvalidObjectException;
 import java.io.UnsupportedEncodingException;
 import java.math.BigDecimal;
 import java.net.URLDecoder;
 import java.net.URLEncoder;
+import java.nio.charset.Charset;
 import java.nio.charset.StandardCharsets;
 import java.util.Currency;
 import java.util.Date;
@@ -25,6 +28,7 @@ public class ImportURIHelper {
     private static final String CARD_ID = DBHelper.LoyaltyCardDbIds.CARD_ID;
     private static final String BARCODE_ID = DBHelper.LoyaltyCardDbIds.BARCODE_ID;
     private static final String BARCODE_TYPE = DBHelper.LoyaltyCardDbIds.BARCODE_TYPE;
+    private static final String BARCODE_ENCODING = DBHelper.LoyaltyCardDbIds.BARCODE_ENCODING;
     private static final String HEADER_COLOR = DBHelper.LoyaltyCardDbIds.HEADER_COLOR;
 
     private final Context context;
@@ -66,6 +70,7 @@ public class ImportURIHelper {
         try {
             // These values are allowed to be null
             CatimaBarcode barcodeType = null;
+            Charset barcodeEncoding = null;
             Date validFrom = null;
             Date expiry = null;
             BigDecimal balance = new BigDecimal("0");
@@ -103,6 +108,11 @@ public class ImportURIHelper {
                 barcodeType = CatimaBarcode.fromName(unparsedBarcodeType);
             }
 
+            String unparsedBarcodeEncoding = kv.get(BARCODE_ENCODING);
+            if (unparsedBarcodeEncoding != null && !unparsedBarcodeEncoding.equals("")) {
+                barcodeEncoding = Charset.forName(unparsedBarcodeEncoding);
+            }
+
             String unparsedBalance = kv.get(BALANCE);
             if (unparsedBalance != null && !unparsedBalance.equals("")) {
                 balance = new BigDecimal(unparsedBalance);
@@ -136,6 +146,7 @@ public class ImportURIHelper {
                     cardId,
                     barcodeId,
                     barcodeType,
+                    barcodeEncoding,
                     headerColor,
                     0,
                     Utils.getUnixTime(),
@@ -195,6 +206,9 @@ public class ImportURIHelper {
         if (loyaltyCard.barcodeType != null) {
             fragment = appendFragment(fragment, BARCODE_TYPE, loyaltyCard.barcodeType.name());
         }
+        if (loyaltyCard.barcodeEncoding != null) {
+            fragment = appendFragment(fragment, BARCODE_ENCODING, loyaltyCard.barcodeEncoding.name());
+        }
         if (loyaltyCard.headerColor != null) {
             fragment = appendFragment(fragment, HEADER_COLOR, loyaltyCard.headerColor.toString());
         }

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

@@ -9,6 +9,7 @@ import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
 import java.math.BigDecimal;
+import java.nio.charset.Charset;
 import java.util.Currency;
 import java.util.Date;
 import java.util.List;
@@ -31,6 +32,8 @@ public class LoyaltyCard {
     @Nullable
     public CatimaBarcode barcodeType;
     @Nullable
+    public Charset barcodeEncoding;
+    @Nullable
     public Integer headerColor;
     public int starStatus;
     public long lastUsed;
@@ -62,6 +65,7 @@ public class LoyaltyCard {
     public static final String BUNDLE_LOYALTY_CARD_CARD_ID = "loyaltyCardCardId";
     public static final String BUNDLE_LOYALTY_CARD_BARCODE_ID = "loyaltyCardBarcodeId";
     public static final String BUNDLE_LOYALTY_CARD_BARCODE_TYPE = "loyaltyCardBarcodeType";
+    public static final String BUNDLE_LOYALTY_CARD_BARCODE_ENCODING = "loyaltyCardBarcodeEncoding";
     public static final String BUNDLE_LOYALTY_CARD_HEADER_COLOR = "loyaltyCardHeaderColor";
     public static final String BUNDLE_LOYALTY_CARD_STAR_STATUS = "loyaltyCardStarStatus";
     public static final String BUNDLE_LOYALTY_CARD_LAST_USED = "loyaltyCardLastUsed";
@@ -90,6 +94,7 @@ public class LoyaltyCard {
         setCardId("");
         setBarcodeId(null);
         setBarcodeType(null);
+        setBarcodeEncoding(null);
         setHeaderColor(null);
         setStarStatus(0);
         setLastUsed(Utils.getUnixTime());
@@ -124,7 +129,7 @@ public class LoyaltyCard {
     public LoyaltyCard(final int id, final String store, final String note, @Nullable final Date validFrom,
                        @Nullable final Date expiry, final BigDecimal balance, @Nullable final Currency balanceType,
                        final String cardId, @Nullable final String barcodeId, @Nullable final CatimaBarcode barcodeType,
-                       @Nullable final Integer headerColor, final int starStatus,
+                       @Nullable final Charset barcodeEncoding, @Nullable final Integer headerColor, final int starStatus,
                        final long lastUsed, final int zoomLevel, final int zoomLevelWidth, final int archiveStatus,
                        @Nullable Bitmap imageThumbnail, @Nullable String imageThumbnailPath,
                        @Nullable Bitmap imageFront, @Nullable String imageFrontPath,
@@ -139,6 +144,7 @@ public class LoyaltyCard {
         setCardId(cardId);
         setBarcodeId(barcodeId);
         setBarcodeType(barcodeType);
+        setBarcodeEncoding(barcodeEncoding);
         setHeaderColor(headerColor);
         setStarStatus(starStatus);
         setLastUsed(lastUsed);
@@ -244,6 +250,10 @@ public class LoyaltyCard {
         this.barcodeType = barcodeType;
     }
 
+    public void setBarcodeEncoding(@Nullable Charset barcodeEncoding) {
+        this.barcodeEncoding = barcodeEncoding;
+    }
+
     public void setHeaderColor(@Nullable Integer headerColor) {
         this.headerColor = headerColor;
     }
@@ -379,6 +389,11 @@ public class LoyaltyCard {
         } else if (requireFull) {
             throw new IllegalArgumentException("Missing key " + BUNDLE_LOYALTY_CARD_BARCODE_TYPE);
         }
+        if (bundle.containsKey(BUNDLE_LOYALTY_CARD_BARCODE_ENCODING)) {
+            setBarcodeEncoding(Charset.forName(bundle.getString(BUNDLE_LOYALTY_CARD_BARCODE_ENCODING)));
+        } else if (requireFull) {
+            throw new IllegalArgumentException("Missing key " + BUNDLE_LOYALTY_CARD_BARCODE_ENCODING);
+        }
         if (bundle.containsKey(BUNDLE_LOYALTY_CARD_HEADER_COLOR)) {
             int tmpHeaderColor = bundle.getInt(BUNDLE_LOYALTY_CARD_HEADER_COLOR);
             setHeaderColor(tmpHeaderColor != -1 ? tmpHeaderColor : null);
@@ -462,6 +477,9 @@ public class LoyaltyCard {
         if (!exportIsLimited || exportLimit.contains(BUNDLE_LOYALTY_CARD_BARCODE_TYPE)) {
             bundle.putString(BUNDLE_LOYALTY_CARD_BARCODE_TYPE, barcodeType != null ? barcodeType.name() : null);
         }
+        if (!exportIsLimited || exportLimit.contains(BUNDLE_LOYALTY_CARD_BARCODE_ENCODING)) {
+            bundle.putString(BUNDLE_LOYALTY_CARD_BARCODE_ENCODING, barcodeEncoding != null ? barcodeEncoding.name() : null);
+        }
         if (!exportIsLimited || exportLimit.contains(BUNDLE_LOYALTY_CARD_HEADER_COLOR)) {
             bundle.putInt(BUNDLE_LOYALTY_CARD_HEADER_COLOR, headerColor != null ? headerColor : -1);
         }
@@ -539,6 +557,9 @@ public class LoyaltyCard {
         // barcodeType
         int barcodeTypeColumn = cursor.getColumnIndexOrThrow(DBHelper.LoyaltyCardDbIds.BARCODE_TYPE);
         CatimaBarcode barcodeType = !cursor.isNull(barcodeTypeColumn) ? CatimaBarcode.fromName(cursor.getString(barcodeTypeColumn)) : null;
+        // barcodeEncoding
+        int barcodeEncodingColumn = cursor.getColumnIndexOrThrow(DBHelper.LoyaltyCardDbIds.BARCODE_ENCODING);
+        Charset barcodeEncoding = !cursor.isNull(barcodeEncodingColumn) ? Charset.forName(cursor.getString(barcodeEncodingColumn)) : null;
         // headerColor
         int headerColorColumn = cursor.getColumnIndexOrThrow(DBHelper.LoyaltyCardDbIds.HEADER_COLOR);
         Integer headerColor = !cursor.isNull(headerColorColumn) ? cursor.getInt(headerColorColumn) : null;
@@ -564,6 +585,7 @@ public class LoyaltyCard {
                 cardId,
                 barcodeId,
                 barcodeType,
+                barcodeEncoding,
                 headerColor,
                 starStatus,
                 lastUsed,
@@ -593,6 +615,7 @@ public class LoyaltyCard {
                 Utils.equals(a.barcodeId, b.barcodeId) && // nullable String
                 Utils.equals(a.barcodeType == null ? null : a.barcodeType.format(),
                         b.barcodeType == null ? null : b.barcodeType.format()) && // nullable CatimaBarcode with no overridden .equals(), so we need to check .format()
+                Utils.equals(a.barcodeEncoding, b.barcodeEncoding) && // nullable String
                 Utils.equals(a.headerColor, b.headerColor) && // nullable Integer
                 a.starStatus == b.starStatus && // non-nullable int
                 a.archiveStatus == b.archiveStatus && // non-nullable int
@@ -619,7 +642,7 @@ public class LoyaltyCard {
     public String toString() {
         return String.format(
                 "LoyaltyCard{%n  id=%s,%n  store=%s,%n  note=%s,%n  validFrom=%s,%n  expiry=%s,%n"
-                        + "  balance=%s,%n  balanceType=%s,%n  cardId=%s,%n  barcodeId=%s,%n  barcodeType=%s,%n"
+                        + "  balance=%s,%n  balanceType=%s,%n  cardId=%s,%n  barcodeId=%s,%n  barcodeType=%s,%n barcodeEncoding=%s,%n"
                         + "  headerColor=%s,%n  starStatus=%s,%n  lastUsed=%s,%n  zoomLevel=%s,%n  zoomLevelWidth=%s,%n  archiveStatus=%s%n"
                         + "  imageThumbnail=%s,%n  imageThumbnailPath=%s,%n  imageFront=%s,%n  imageFrontPath=%s,%n  imageBack=%s,%n  imageBackPath=%s,%n}",
                 this.id,
@@ -632,6 +655,7 @@ public class LoyaltyCard {
                 this.cardId,
                 this.barcodeId,
                 this.barcodeType != null ? this.barcodeType.format() : null,
+                this.barcodeEncoding != null ? this.barcodeEncoding.name() : null,
                 this.headerColor,
                 this.starStatus,
                 this.lastUsed,

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

@@ -70,6 +70,8 @@ import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.io.InvalidObjectException;
 import java.math.BigDecimal;
+import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
 import java.text.DateFormat;
 import java.text.ParseException;
 import java.util.ArrayList;
@@ -128,6 +130,7 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity implements
     TextView cardIdFieldView;
     AutoCompleteTextView barcodeIdField;
     AutoCompleteTextView barcodeTypeField;
+    AutoCompleteTextView barcodeEncodingField;
     ImageView barcodeImage;
     View barcodeImageLayout;
     View barcodeCaptureLayout;
@@ -229,6 +232,14 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity implements
         viewModel.setHasChanged(true);
     }
 
+    protected void setLoyaltyCardBarcodeEncoding(@Nullable Charset barcodeEncoding) {
+        viewModel.getLoyaltyCard().setBarcodeEncoding(barcodeEncoding);
+
+        generateBarcode();
+
+        viewModel.setHasChanged(true);
+    }
+
     protected void setLoyaltyCardHeaderColor(@Nullable Integer headerColor) {
         viewModel.getLoyaltyCard().setHeaderColor(headerColor);
 
@@ -334,6 +345,7 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity implements
         cardIdFieldView = binding.cardIdView;
         barcodeIdField = binding.barcodeIdField;
         barcodeTypeField = binding.barcodeTypeField;
+        barcodeEncodingField = binding.barcodeEncodingField;
         barcodeImage = binding.barcode;
         barcodeImage.setClipToOutline(true);
         barcodeImageLayout = binding.barcodeLayout;
@@ -577,6 +589,30 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity implements
             }
         });
 
+        barcodeEncodingField.addTextChangedListener(new SimpleTextWatcher() {
+            @Override
+            public void onTextChanged(CharSequence s, int start, int before, int count) {
+                if (!s.toString().isEmpty()) {
+                    Log.d(TAG, "Setting barcode encoding to " + s.toString());
+                    if (s.toString().equals(getString(R.string.automatic))) {
+                        setLoyaltyCardBarcodeEncoding(null);
+                    } else {
+                        setLoyaltyCardBarcodeEncoding(Charset.forName(s.toString()));
+                    }
+                }
+            }
+
+            @Override
+            public void afterTextChanged(Editable s) {
+                ArrayList<String> barcodeEncodingList = new ArrayList<>();
+                barcodeEncodingList.add(getString(R.string.automatic));
+                barcodeEncodingList.add(StandardCharsets.ISO_8859_1.name());
+                barcodeEncodingList.add(StandardCharsets.UTF_8.name());
+                ArrayAdapter<String> barcodeEncodingAdapter = new ArrayAdapter<>(LoyaltyCardEditActivity.this, android.R.layout.select_dialog_item, barcodeEncodingList);
+                barcodeEncodingField.setAdapter(barcodeEncodingAdapter);
+            }
+        });
+
         binding.tabs.addOnTabSelectedListener(new TabLayout.OnTabSelectedListener() {
             @Override
             public void onTabSelected(TabLayout.Tab tab) {
@@ -773,6 +809,8 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity implements
         barcodeIdField.setText(barcodeId != null && !barcodeId.isEmpty() ? barcodeId : getString(R.string.sameAsCardId));
         CatimaBarcode barcodeType = viewModel.getLoyaltyCard().barcodeType;
         barcodeTypeField.setText(barcodeType != null ? barcodeType.prettyName() : getString(R.string.noBarcode));
+        Charset barcodeEncoding = viewModel.getLoyaltyCard().barcodeEncoding;
+        barcodeEncodingField.setText(barcodeEncoding != null ? barcodeEncoding.name() : getString(R.string.automatic));
 
         // We set the balance here (with onResuming/onRestoring == true) to prevent formatBalanceCurrencyField() from setting it (via onTextChanged),
         // which can cause issues when switching locale because it parses the balance and e.g. the decimal separator may have changed.
@@ -1479,9 +1517,9 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity implements
         // This makes the DBHelper set it to the current date
         // So that new and edited card are always on top when sorting by recently used
         if (viewModel.getUpdateLoyaltyCard()) {
-            DBHelper.updateLoyaltyCard(mDatabase, viewModel.getLoyaltyCardId(), viewModel.getLoyaltyCard().store, viewModel.getLoyaltyCard().note, viewModel.getLoyaltyCard().validFrom, viewModel.getLoyaltyCard().expiry, viewModel.getLoyaltyCard().balance, viewModel.getLoyaltyCard().balanceType, viewModel.getLoyaltyCard().cardId, viewModel.getLoyaltyCard().barcodeId, viewModel.getLoyaltyCard().barcodeType, viewModel.getLoyaltyCard().headerColor, viewModel.getLoyaltyCard().starStatus, null, viewModel.getLoyaltyCard().archiveStatus);
+            DBHelper.updateLoyaltyCard(mDatabase, viewModel.getLoyaltyCardId(), viewModel.getLoyaltyCard().store, viewModel.getLoyaltyCard().note, viewModel.getLoyaltyCard().validFrom, viewModel.getLoyaltyCard().expiry, viewModel.getLoyaltyCard().balance, viewModel.getLoyaltyCard().balanceType, viewModel.getLoyaltyCard().cardId, viewModel.getLoyaltyCard().barcodeId, viewModel.getLoyaltyCard().barcodeType, viewModel.getLoyaltyCard().barcodeEncoding, viewModel.getLoyaltyCard().headerColor, viewModel.getLoyaltyCard().starStatus, null, viewModel.getLoyaltyCard().archiveStatus);
         } else {
-            viewModel.setLoyaltyCardId((int) DBHelper.insertLoyaltyCard(mDatabase, viewModel.getLoyaltyCard().store, viewModel.getLoyaltyCard().note, viewModel.getLoyaltyCard().validFrom, viewModel.getLoyaltyCard().expiry, viewModel.getLoyaltyCard().balance, viewModel.getLoyaltyCard().balanceType, viewModel.getLoyaltyCard().cardId, viewModel.getLoyaltyCard().barcodeId, viewModel.getLoyaltyCard().barcodeType, viewModel.getLoyaltyCard().headerColor, 0, null, 0));
+            viewModel.setLoyaltyCardId((int) DBHelper.insertLoyaltyCard(mDatabase, viewModel.getLoyaltyCard().store, viewModel.getLoyaltyCard().note, viewModel.getLoyaltyCard().validFrom, viewModel.getLoyaltyCard().expiry, viewModel.getLoyaltyCard().balance, viewModel.getLoyaltyCard().balanceType, viewModel.getLoyaltyCard().cardId, viewModel.getLoyaltyCard().barcodeId, viewModel.getLoyaltyCard().barcodeType, viewModel.getLoyaltyCard().barcodeEncoding, viewModel.getLoyaltyCard().headerColor, 0, null, 0));
         }
 
         try {
@@ -1596,6 +1634,7 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity implements
 
         String cardIdString = viewModel.getLoyaltyCard().barcodeId != null ? viewModel.getLoyaltyCard().barcodeId : viewModel.getLoyaltyCard().cardId;
         CatimaBarcode barcodeFormat = viewModel.getLoyaltyCard().barcodeType;
+        Charset barcodeEncoding = viewModel.getLoyaltyCard().barcodeEncoding;
 
         if (cardIdString == null || cardIdString.isEmpty() || barcodeFormat == null) {
             barcodeImageLayout.setVisibility(View.GONE);
@@ -1615,13 +1654,13 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity implements
                             barcodeImage.getViewTreeObserver().removeOnGlobalLayoutListener(this);
 
                             Log.d(TAG, "ImageView size now known");
-                            BarcodeImageWriterTask barcodeWriter = new BarcodeImageWriterTask(getApplicationContext(), barcodeImage, cardIdString, barcodeFormat, null, false, LoyaltyCardEditActivity.this, true, false);
+                            BarcodeImageWriterTask barcodeWriter = new BarcodeImageWriterTask(getApplicationContext(), barcodeImage, cardIdString, barcodeFormat, barcodeEncoding, null, false, LoyaltyCardEditActivity.this, true, false);
                             viewModel.getTaskHandler().executeTask(TaskHandler.TYPE.BARCODE, barcodeWriter);
                         }
                     });
         } else {
             Log.d(TAG, "ImageView size known known, creating barcode");
-            BarcodeImageWriterTask barcodeWriter = new BarcodeImageWriterTask(getApplicationContext(), barcodeImage, cardIdString, barcodeFormat, null, false, this, true, false);
+            BarcodeImageWriterTask barcodeWriter = new BarcodeImageWriterTask(getApplicationContext(), barcodeImage, cardIdString, barcodeFormat, barcodeEncoding, null, false, this, true, false);
             viewModel.getTaskHandler().executeTask(TaskHandler.TYPE.BARCODE, barcodeWriter);
         }
     }

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

@@ -39,6 +39,7 @@ import android.widget.TextView;
 import android.widget.Toast;
 
 import androidx.activity.OnBackPressedCallback;
+import androidx.annotation.Nullable;
 import androidx.annotation.StringRes;
 import androidx.appcompat.app.ActionBar;
 import androidx.appcompat.app.AlertDialog;
@@ -58,6 +59,7 @@ import com.google.zxing.BarcodeFormat;
 import java.io.File;
 import java.io.UnsupportedEncodingException;
 import java.math.BigDecimal;
+import java.nio.charset.Charset;
 import java.text.DateFormat;
 import java.text.ParseException;
 import java.util.ArrayList;
@@ -87,6 +89,8 @@ public class LoyaltyCardViewActivity extends CatimaAppCompatActivity implements
     String cardIdString;
     String barcodeIdString;
     CatimaBarcode format;
+    @Nullable
+    Charset barcodeEncoding;
 
     Bitmap frontImageBitmap;
     Bitmap backImageBitmap;
@@ -686,6 +690,7 @@ public class LoyaltyCardViewActivity extends CatimaAppCompatActivity implements
         format = loyaltyCard.barcodeType;
         cardIdString = loyaltyCard.cardId;
         barcodeIdString = loyaltyCard.barcodeId;
+        barcodeEncoding = loyaltyCard.barcodeEncoding;
 
         binding.mainImageDescription.setText(loyaltyCard.cardId);
 
@@ -959,6 +964,7 @@ public class LoyaltyCardViewActivity extends CatimaAppCompatActivity implements
                     barcodeRenderTarget,
                     barcodeIdString != null ? barcodeIdString : cardIdString,
                     format,
+                    barcodeEncoding,
                     null,
                     false,
                     this,

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

@@ -58,8 +58,8 @@ class MainActivity : CatimaAppCompatActivity(), CardAdapterListener {
     private var selectedTab: Int = 0
     private lateinit var groupsTabLayout: TabLayout
     private lateinit var mUpdateLoyaltyCardListRunnable: Runnable
-    private lateinit var mBarcodeScannerLauncher: ActivityResultLauncher<Intent?>
-    private lateinit var mSettingsLauncher: ActivityResultLauncher<Intent?>
+    private lateinit var mBarcodeScannerLauncher: ActivityResultLauncher<Intent>
+    private lateinit var mSettingsLauncher: ActivityResultLauncher<Intent>
 
     private val mCurrentActionModeCallback: ActionMode.Callback = object : ActionMode.Callback {
         override fun onCreateActionMode(inputMode: ActionMode, inputMenu: Menu?): Boolean {
@@ -105,6 +105,24 @@ class MainActivity : CatimaAppCompatActivity(), CardAdapterListener {
                     inputMode.finish()
                     return true
                 }
+                R.id.action_duplicate -> {
+                    require(mAdapter.selectedItemCount == 1) { "Cannot duplicate more than 1 card at a time" }
+
+                    startActivity(
+                        Intent(applicationContext, LoyaltyCardEditActivity::class.java).apply {
+                            putExtras(Bundle().apply {
+                                putInt(
+                                    LoyaltyCardEditActivity.BUNDLE_ID,
+                                    mAdapter.getSelectedItems()[0].id
+                                )
+                                putBoolean(LoyaltyCardEditActivity.BUNDLE_DUPLICATE_ID, true)
+                            })
+                        }
+                    )
+
+                    inputMode.finish()
+                    return true
+                }
                 R.id.action_delete -> {
                     MaterialAlertDialogBuilder(this@MainActivity).apply {
                         // The following may seem weird, but it is necessary to give translators enough flexibility.
@@ -372,6 +390,7 @@ class MainActivity : CatimaAppCompatActivity(), CardAdapterListener {
         }
         binding.fabAdd.bringToFront()
 
+        // Apply column count setting to card list
         val layoutManager = contentMainBinding.list.layoutManager as GridLayoutManager?
         if (layoutManager != null) {
             val settings = Settings(this)
@@ -824,6 +843,7 @@ class MainActivity : CatimaAppCompatActivity(), CardAdapterListener {
             )
 
             val editItem = mCurrentActionMode!!.menu.findItem(R.id.action_edit)
+            val duplicateItem = mCurrentActionMode!!.menu.findItem(R.id.action_duplicate)
             val archiveItem = mCurrentActionMode!!.menu.findItem(R.id.action_archive)
             val unarchiveItem = mCurrentActionMode!!.menu.findItem(R.id.action_unarchive)
             val starItem = mCurrentActionMode!!.menu.findItem(R.id.action_star)
@@ -861,12 +881,16 @@ class MainActivity : CatimaAppCompatActivity(), CardAdapterListener {
                 unstarItem.isVisible = !hasUnstarred
                 editItem.isVisible = true
                 editItem.isEnabled = true
+                duplicateItem.isVisible = true
+                duplicateItem.isEnabled = true
             } else {
                 starItem.isVisible = hasUnstarred
                 unstarItem.isVisible = hasStarred
 
                 editItem.isVisible = false
                 editItem.isEnabled = false
+                duplicateItem.isVisible = false
+                duplicateItem.isEnabled = false
             }
 
             mCurrentActionMode!!.invalidate()

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

@@ -12,10 +12,12 @@ import android.widget.TextView
 import android.widget.Toast
 import androidx.activity.OnBackPressedCallback
 import androidx.core.widget.doAfterTextChanged
+import androidx.recyclerview.widget.GridLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import protect.card_locker.LoyaltyCardCursorAdapter.CardAdapterListener
 import protect.card_locker.databinding.ActivityManageGroupBinding
+import protect.card_locker.preferences.Settings
 
 class ManageGroupActivity : CatimaAppCompatActivity(), CardAdapterListener {
     private lateinit var binding: ActivityManageGroupBinding
@@ -132,7 +134,15 @@ class ManageGroupActivity : CatimaAppCompatActivity(), CardAdapterListener {
                 override fun handleOnBackPressed() {
                     leaveWithoutSaving()
                 }
-            })
+            }
+        )
+
+        // Apply column count setting to card list
+        val layoutManager = mCardList.layoutManager as GridLayoutManager?
+        if (layoutManager != null) {
+            val settings = Settings(this)
+            layoutManager.setSpanCount(settings.getPreferredColumnCount())
+        }
     }
 
     private fun adapterStateToBundle(adapterState: HashMap<Int, Boolean>): Bundle {

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

@@ -1,18 +1,17 @@
 package protect.card_locker;
 
+import android.app.Activity;
 import android.content.ActivityNotFoundException;
 import android.content.Intent;
 import android.net.Uri;
 import android.util.Log;
 import android.widget.Toast;
 
-import androidx.appcompat.app.AppCompatActivity;
-
 public class OpenWebLinkHandler {
 
     private static final String TAG = "Catima";
 
-    public void openBrowser(AppCompatActivity activity, String url) {
+    public void openBrowser(Activity activity, String url) {
         if (url == null) {
             return;
         }

app/src/main/java/protect/card_locker/PkpassParser.kt

@@ -14,6 +14,7 @@ import org.json.JSONObject
 import java.io.FileNotFoundException
 import java.io.IOException
 import java.math.BigDecimal
+import java.nio.charset.Charset
 import java.text.DateFormat
 import java.text.ParseException
 import java.time.ZonedDateTime
@@ -40,6 +41,7 @@ class PkpassParser(context: Context, uri: Uri?) {
     private var cardId: String = context.getString(R.string.noBarcode)
     private var barcodeId: String? = null
     private var barcodeType: CatimaBarcode? = null
+    private var barcodeEncoding: Charset? = null
     private var headerColor: Int? = null
     private val starStatus = 0
     private val lastUsed: Long = 0
@@ -134,6 +136,7 @@ class PkpassParser(context: Context, uri: Uri?) {
             cardId,
             barcodeId,
             barcodeType,
+            barcodeEncoding,
             headerColor,
             starStatus,
             lastUsed,
@@ -342,13 +345,14 @@ class PkpassParser(context: Context, uri: Uri?) {
             else -> throw IllegalArgumentException("No valid barcode type")
         }
 
-        // FIXME: We probably need to do something with the messageEncoding field
         try {
             cardId = barcodeInfo.getString("altText")
             barcodeId = barcodeInfo.getString("message")
+            barcodeEncoding = Charset.forName(barcodeInfo.getString("messageEncoding"))
         } catch (ignored: JSONException) {
             cardId = barcodeInfo.getString("message")
             barcodeId = null
+            barcodeEncoding = Charset.forName(barcodeInfo.getString("messageEncoding"))
         }
 
         // Don't set barcodeId if it's the same as cardId

app/src/main/java/protect/card_locker/ScanActivity.kt

@@ -538,7 +538,7 @@ class ScanActivity : CatimaAppCompatActivity() {
 
     override fun onRequestPermissionsResult(
         requestCode: Int,
-        permissions: Array<String?>,
+        permissions: Array<String>,
         grantResults: IntArray
     ) {
         super.onRequestPermissionsResult(requestCode, permissions, grantResults)
@@ -548,7 +548,7 @@ class ScanActivity : CatimaAppCompatActivity() {
 
     override fun onMockedRequestPermissionsResult(
         requestCode: Int,
-        permissions: Array<String?>,
+        permissions: Array<String>,
         grantResults: IntArray
     ) {
         val granted =

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

@@ -118,7 +118,7 @@ public class Utils {
     static final double LUMINANCE_MIDPOINT = 0.5;
 
     static final int BITMAP_SIZE_SMALL = 512;
-    static final int BITMAP_SIZE_BIG = 2048;
+    static final int BITMAP_SIZE_BIG = 1600;
 
     static public LetterBitmap generateIcon(Context context, LoyaltyCard loyaltyCard, boolean forShortcut) {
         return generateIcon(context, loyaltyCard.store, loyaltyCard.headerColor, forShortcut);
@@ -963,31 +963,9 @@ public class Utils {
     // 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.applyToActivityIfAvailable(activity);
-        }
+        DynamicColors.applyToActivityIfAvailable(activity);
 
         if (isDarkModeEnabled(activity) && settings.getOledDark()) {
             theme.applyStyle(R.style.DarkBackground, true);

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

@@ -0,0 +1,97 @@
+package protect.card_locker.compose
+
+import androidx.activity.compose.LocalActivity
+import androidx.compose.foundation.clickable
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.rememberScrollState
+import androidx.compose.foundation.verticalScroll
+import androidx.compose.material3.AlertDialog
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Text
+import androidx.compose.material3.TextButton
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.AnnotatedString
+import androidx.compose.ui.unit.dp
+import protect.card_locker.OpenWebLinkHandler
+import protect.card_locker.R
+
+@Composable
+fun CatimaAboutSection(
+    title: String,
+    message: String,
+    modifier: Modifier = Modifier,
+    onClickUrl: String? = null,
+    onClickDialogText: AnnotatedString? = null,
+) {
+    val activity = LocalActivity.current
+
+    val openDialog = remember { mutableStateOf(false) }
+
+    Row(
+        modifier = modifier
+            .padding(horizontal = 16.dp, vertical = 8.dp)
+            .clickable {
+                if (onClickDialogText != null) {
+                    openDialog.value = true
+                } else if (onClickUrl != null) {
+                    OpenWebLinkHandler().openBrowser(activity, onClickUrl)
+                }
+            }
+    ) {
+        Column(modifier = Modifier.weight(1F)) {
+            Text(
+                text = title,
+                style = MaterialTheme.typography.titleMedium
+            )
+            Text(text = message)
+        }
+        Text(modifier = Modifier.align(Alignment.CenterVertically),
+            text = ">",
+            style = MaterialTheme.typography.bodyMedium
+        )
+    }
+    if (openDialog.value && onClickDialogText != null) {
+        AlertDialog(
+            icon = {},
+            title = {
+                Text(text = title)
+            },
+            text = {
+                Text(
+                    text = onClickDialogText,
+                    modifier = Modifier.verticalScroll(rememberScrollState())
+                )
+            },
+            onDismissRequest = {
+                openDialog.value = false
+            },
+            confirmButton = {
+                TextButton(
+                    onClick = {
+                        openDialog.value = false
+                    }
+                ) {
+                    Text(stringResource(R.string.ok))
+                }
+            },
+            dismissButton = {
+                if (onClickUrl != null) {
+                    TextButton(
+                        onClick = {
+                            OpenWebLinkHandler().openBrowser(activity, onClickUrl)
+                        }
+                    ) {
+                        Text(stringResource(R.string.view_online))
+                    }
+                }
+            }
+        )
+    }
+}

app/src/main/java/protect/card_locker/compose/Catima.kt

@@ -0,0 +1,34 @@
+package protect.card_locker.compose
+
+import androidx.activity.OnBackPressedDispatcher
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.automirrored.filled.ArrowBack
+import androidx.compose.material3.ExperimentalMaterial3Api
+import androidx.compose.material3.Icon
+import androidx.compose.material3.IconButton
+import androidx.compose.material3.Text
+import androidx.compose.material3.TopAppBar
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.platform.testTag
+import androidx.compose.ui.res.stringResource
+import protect.card_locker.R
+
+@OptIn(ExperimentalMaterial3Api::class)
+@Composable
+fun CatimaTopAppBar(title: String, onBackPressedDispatcher: OnBackPressedDispatcher?) {
+    TopAppBar(
+        modifier = Modifier.testTag("topbar_catima"),
+        title = { Text(text = title) },
+        navigationIcon = {
+            if (onBackPressedDispatcher != null) {
+                IconButton(onClick = { onBackPressedDispatcher.onBackPressed() }) {
+                    Icon(
+                        imageVector = Icons.AutoMirrored.Filled.ArrowBack,
+                        contentDescription = stringResource(R.string.back)
+                    )
+                }
+            }
+        }
+    )
+}

app/src/main/java/protect/card_locker/compose/theme/Theme.kt

@@ -0,0 +1,51 @@
+package protect.card_locker.compose.theme
+
+import android.os.Build
+import androidx.appcompat.app.AppCompatDelegate
+import androidx.compose.foundation.isSystemInDarkTheme
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.darkColorScheme
+import androidx.compose.material3.dynamicDarkColorScheme
+import androidx.compose.material3.dynamicLightColorScheme
+import androidx.compose.material3.lightColorScheme
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.res.colorResource
+import protect.card_locker.R
+import protect.card_locker.preferences.Settings
+
+@Composable
+fun CatimaTheme(content: @Composable () -> Unit) {
+    val context = LocalContext.current
+    val settings = Settings(context)
+
+    val isDynamicColorSupported = Build.VERSION.SDK_INT >= Build.VERSION_CODES.S
+
+    val lightTheme = if (isDynamicColorSupported) {
+        dynamicLightColorScheme(context)
+    } else {
+        lightColorScheme(primary = colorResource(id = R.color.md_theme_light_primary))
+    }
+
+    var darkTheme = if (isDynamicColorSupported) {
+        dynamicDarkColorScheme(context)
+    } else {
+        darkColorScheme(primary = colorResource(id = R.color.md_theme_dark_primary))
+    }
+
+    if (settings.oledDark) {
+        darkTheme = darkTheme.copy(background = Color.Black)
+    }
+
+    val colorScheme = when (settings.theme) {
+        AppCompatDelegate.MODE_NIGHT_NO -> lightTheme
+        AppCompatDelegate.MODE_NIGHT_YES -> darkTheme
+        else -> if (isSystemInDarkTheme()) darkTheme else lightTheme
+    }
+
+    MaterialTheme(
+        colorScheme = colorScheme,
+        content = content
+    )
+}

app/src/main/java/protect/card_locker/contentprovider/CardsContentProvider.java

@@ -52,6 +52,7 @@ public class CardsContentProvider extends ContentProvider {
             LoyaltyCardDbIds.CARD_ID,
             LoyaltyCardDbIds.BARCODE_ID,
             LoyaltyCardDbIds.BARCODE_TYPE,
+            // FIXME: Expose BARCODE_ENCODING but without ever exposing the null value (so apps using this don't have to guess)
             LoyaltyCardDbIds.STAR_STATUS,
             LoyaltyCardDbIds.LAST_USED,
             LoyaltyCardDbIds.ARCHIVE_STATUS,

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

@@ -134,6 +134,7 @@ public class CatimaExporter implements Exporter {
                 DBHelper.LoyaltyCardDbIds.CARD_ID,
                 DBHelper.LoyaltyCardDbIds.BARCODE_ID,
                 DBHelper.LoyaltyCardDbIds.BARCODE_TYPE,
+                DBHelper.LoyaltyCardDbIds.BARCODE_ENCODING,
                 DBHelper.LoyaltyCardDbIds.HEADER_COLOR,
                 DBHelper.LoyaltyCardDbIds.STAR_STATUS,
                 DBHelper.LoyaltyCardDbIds.LAST_USED,
@@ -154,6 +155,7 @@ public class CatimaExporter implements Exporter {
                     card.cardId,
                     card.barcodeId,
                     card.barcodeType != null ? card.barcodeType.name() : "",
+                    card.barcodeEncoding != null ? card.barcodeEncoding.name() : "",
                     card.headerColor,
                     card.starStatus,
                     card.lastUsed,

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

@@ -20,6 +20,7 @@ import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.io.StringReader;
 import java.math.BigDecimal;
+import java.nio.charset.Charset;
 import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.Currency;
@@ -127,10 +128,10 @@ public class CatimaImporter implements Importer {
             LoyaltyCard existing = DBHelper.getLoyaltyCard(context, database, card.id);
             if (existing == null) {
                 DBHelper.insertLoyaltyCard(database, card.id, card.store, card.note, card.validFrom, card.expiry, card.balance, card.balanceType,
-                        card.cardId, card.barcodeId, card.barcodeType, card.headerColor, card.starStatus, card.lastUsed, card.archiveStatus);
+                        card.cardId, card.barcodeId, card.barcodeType, card.barcodeEncoding, card.headerColor, card.starStatus, card.lastUsed, card.archiveStatus);
             } else if (!isDuplicate(context, existing, card, existingImages, imageChecksums)) {
                 long newId = DBHelper.insertLoyaltyCard(database, card.store, card.note, card.validFrom, card.expiry, card.balance, card.balanceType,
-                        card.cardId, card.barcodeId, card.barcodeType, card.headerColor, card.starStatus, card.lastUsed, card.archiveStatus);
+                        card.cardId, card.barcodeId, card.barcodeType, card.barcodeEncoding, card.headerColor, card.starStatus, card.lastUsed, card.archiveStatus);
                 idMap.put(card.id, (int) newId);
             }
         }
@@ -458,6 +459,12 @@ public class CatimaImporter implements Importer {
             barcodeType = CatimaBarcode.fromName(unparsedBarcodeType);
         }
 
+        Charset barcodeEncoding = null;
+        String unparsedBarcodeEncoding = CSVHelpers.extractString(DBHelper.LoyaltyCardDbIds.BARCODE_ENCODING, record, "");
+        if (!unparsedBarcodeEncoding.isEmpty()) {
+            barcodeEncoding = Charset.forName(unparsedBarcodeEncoding);
+        }
+
         Integer headerColor = null;
         try {
             headerColor = CSVHelpers.extractInt(DBHelper.LoyaltyCardDbIds.HEADER_COLOR, record);
@@ -501,6 +508,7 @@ public class CatimaImporter implements Importer {
                 cardId,
                 barcodeId,
                 barcodeType,
+                barcodeEncoding,
                 headerColor,
                 starStatus,
                 lastUsed,

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

@@ -160,6 +160,7 @@ public class FidmeImporter implements Importer {
                 cardId,
                 null,
                 barcodeType,
+                null,
                 headerColor,
                 starStatus,
                 Utils.getUnixTime(),
@@ -181,7 +182,7 @@ public class FidmeImporter implements Importer {
         for (LoyaltyCard card : data.cards) {
             // Do not use card.id which is set to -1
             DBHelper.insertLoyaltyCard(database, card.store, card.note, card.validFrom, card.expiry, card.balance, card.balanceType,
-                    card.cardId, card.barcodeId, card.barcodeType, card.headerColor, card.starStatus, card.lastUsed, card.archiveStatus);
+                    card.cardId, card.barcodeId, card.barcodeType, card.barcodeEncoding, card.headerColor, card.starStatus, card.lastUsed, card.archiveStatus);
         }
     }
 }

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

@@ -162,6 +162,7 @@ public class VoucherVaultImporter implements Importer {
                     cardId,
                     null,
                     barcodeType,
+                    null,
                     headerColor,
                     0,
                     Utils.getUnixTime(),
@@ -186,7 +187,7 @@ public class VoucherVaultImporter implements Importer {
         for (LoyaltyCard card : data.cards) {
             // Do not use card.id which is set to -1
             DBHelper.insertLoyaltyCard(database, card.store, card.note, card.validFrom, card.expiry, card.balance, card.balanceType,
-                    card.cardId, card.barcodeId, card.barcodeType, card.headerColor, card.starStatus, card.lastUsed, card.archiveStatus);
+                    card.cardId, card.barcodeId, card.barcodeType, card.barcodeEncoding, card.headerColor, card.starStatus, card.lastUsed, card.archiveStatus);
         }
     }
 }

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

@@ -90,10 +90,6 @@ public class Settings {
         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));
-    }
-
     public int getPreferredColumnCount() {
         var defaultSymbol = mContext.getResources().getString(R.string.settings_key_automatic_column_count);
         var defaultColumnCount = mContext.getResources().getInteger(R.integer.main_view_card_columns);

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

@@ -11,7 +11,6 @@ import androidx.core.os.LocaleListCompat
 import androidx.preference.ListPreference
 import androidx.preference.Preference
 import androidx.preference.PreferenceFragmentCompat
-import com.google.android.material.color.DynamicColors
 import protect.card_locker.BuildConfig
 import protect.card_locker.CatimaAppCompatActivity
 import protect.card_locker.MainActivity
@@ -103,16 +102,6 @@ class SettingsActivity : CatimaAppCompatActivity() {
                 true
             }
 
-            val themeColorPreference = findPreference<ListPreference>(getString(R.string.setting_key_theme_color))
-            themeColorPreference!!.setOnPreferenceChangeListener { _, _ ->
-                refreshActivity(true)
-                true
-            }
-            if (!DynamicColors.isDynamicColorAvailable()) {
-                themeColorPreference.setEntryValues(R.array.color_values_no_dynamic)
-                themeColorPreference.setEntries(R.array.color_value_strings_no_dynamic)
-            }
-
             val oledDarkPreference = findPreference<Preference>(getString(R.string.settings_key_oled_dark))
             oledDarkPreference!!.setOnPreferenceChangeListener { _, _ ->
                 refreshActivity(true)

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

@@ -1,421 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<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"
-    android:fitsSystemWindows="true"
-    tools:context="protect.card_locker.MainActivity">
-
-    <com.google.android.material.appbar.AppBarLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:fitsSystemWindows="true">
-
-        <com.google.android.material.appbar.MaterialToolbar
-            android:id="@+id/toolbar"
-            android:layout_width="match_parent"
-            android:layout_height="?attr/actionBarSize"
-            style="?attr/toolbarStyle" />
-
-    </com.google.android.material.appbar.AppBarLayout>
-
-    <androidx.core.widget.NestedScrollView
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:layout_marginTop="?attr/actionBarSize"
-        android:paddingVertical="8dp"
-        android:clipToPadding="false">
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical">
-
-            <androidx.constraintlayout.widget.ConstraintLayout
-                android:id="@+id/version_history"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:paddingVertical="8dp"
-                android:paddingHorizontal="16dp"
-                android:background="?android:selectableItemBackground">
-
-                <TextView
-                    android:id="@+id/version_history_main"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:fontFamily="sans-serif-medium"
-                    android:paddingStart="2dp"
-                    android:paddingEnd="30dp"
-                    android:text="@string/version_history"
-                    android:textSize="18sp"
-                    app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toTopOf="parent" />
-
-                <TextView
-                    android:id="@+id/version_history_sub"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:paddingStart="2dp"
-                    android:paddingEnd="30dp"
-                    android:textSize="16sp"
-                    app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toBottomOf="@id/version_history_main" />
-
-                <TextView
-                    android:importantForAccessibility="no"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_margin="8dp"
-                    android:fontFamily="sans-serif-medium"
-                    android:text="@string/arrow"
-                    android:textSize="20sp"
-                    app:layout_constraintBottom_toBottomOf="parent"
-                    app:layout_constraintEnd_toEndOf="parent"
-                    app:layout_constraintTop_toTopOf="parent" />
-            </androidx.constraintlayout.widget.ConstraintLayout>
-
-            <androidx.constraintlayout.widget.ConstraintLayout
-                android:id="@+id/credits"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:paddingVertical="8dp"
-                android:paddingHorizontal="16dp"
-                android:background="?android:selectableItemBackground">
-
-                <TextView
-                    android:id="@+id/credits_main"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:fontFamily="sans-serif-medium"
-                    android:paddingStart="2dp"
-                    android:paddingEnd="30dp"
-                    android:text="@string/credits"
-                    android:textSize="18sp"
-                    app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toTopOf="parent" />
-
-                <TextView
-                    android:id="@+id/credits_sub"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:paddingStart="2dp"
-                    android:paddingEnd="30dp"
-                    android:textSize="16sp"
-                    app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toBottomOf="@id/credits_main" />
-
-                <TextView
-                    android:importantForAccessibility="no"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_margin="8dp"
-                    android:fontFamily="sans-serif-medium"
-                    android:text="@string/arrow"
-                    android:textSize="20sp"
-                    app:layout_constraintBottom_toBottomOf="parent"
-                    app:layout_constraintEnd_toEndOf="parent"
-                    app:layout_constraintTop_toTopOf="parent" />
-            </androidx.constraintlayout.widget.ConstraintLayout>
-
-            <androidx.constraintlayout.widget.ConstraintLayout
-                android:id="@+id/translate"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:paddingVertical="8dp"
-                android:paddingHorizontal="16dp"
-                android:background="?android:selectableItemBackground">
-
-                <TextView
-                    android:id="@+id/translate_main"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:fontFamily="sans-serif-medium"
-                    android:paddingStart="2dp"
-                    android:paddingEnd="30dp"
-                    android:text="@string/help_translate_this_app"
-                    android:textSize="18sp"
-                    app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toTopOf="parent" />
-
-                <TextView
-                    android:id="@+id/translate_sub"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:paddingStart="2dp"
-                    android:paddingEnd="30dp"
-                    android:text="@string/translate_platform"
-                    android:textSize="16sp"
-                    app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toBottomOf="@id/translate_main"/>
-
-                <TextView
-                    android:importantForAccessibility="no"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_margin="8dp"
-                    android:fontFamily="sans-serif-medium"
-                    android:text="@string/arrow"
-                    android:textSize="20sp"
-                    app:layout_constraintBottom_toBottomOf="parent"
-                    app:layout_constraintEnd_toEndOf="parent"
-                    app:layout_constraintTop_toTopOf="parent" />
-            </androidx.constraintlayout.widget.ConstraintLayout>
-
-            <androidx.constraintlayout.widget.ConstraintLayout
-                android:id="@+id/license"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:paddingVertical="8dp"
-                android:paddingHorizontal="16dp"
-                android:background="?android:selectableItemBackground">
-
-                <TextView
-                    android:id="@+id/license_main"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:fontFamily="sans-serif-medium"
-                    android:paddingStart="2dp"
-                    android:paddingEnd="30dp"
-                    android:text="@string/license"
-                    android:textSize="18sp"
-                    app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toTopOf="parent" />
-
-                <TextView
-                    android:id="@+id/license_sub"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:paddingStart="2dp"
-                    android:paddingEnd="30dp"
-                    android:text="@string/app_license"
-                    android:textSize="16sp"
-                    app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toBottomOf="@id/license_main"/>
-
-                <TextView
-                    android:importantForAccessibility="no"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_margin="8dp"
-                    android:fontFamily="sans-serif-medium"
-                    android:text="@string/arrow"
-                    android:textSize="20sp"
-                    app:layout_constraintBottom_toBottomOf="parent"
-                    app:layout_constraintEnd_toEndOf="parent"
-                    app:layout_constraintTop_toTopOf="parent" />
-            </androidx.constraintlayout.widget.ConstraintLayout>
-
-            <androidx.constraintlayout.widget.ConstraintLayout
-                android:id="@+id/repo"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:paddingVertical="8dp"
-                android:paddingHorizontal="16dp"
-                android:background="?android:selectableItemBackground">
-
-                <TextView
-                    android:id="@+id/repo_main"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:fontFamily="sans-serif-medium"
-                    android:paddingStart="2dp"
-                    android:paddingEnd="30dp"
-                    android:text="@string/source_repository"
-                    android:textSize="18sp"
-                    app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toTopOf="parent" />
-
-                <TextView
-                    android:id="@+id/repo_sub"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:paddingStart="2dp"
-                    android:paddingEnd="30dp"
-                    android:text="@string/on_github"
-                    android:textSize="16sp"
-                    app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toBottomOf="@id/repo_main" />
-
-                <TextView
-                    android:importantForAccessibility="no"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_margin="8dp"
-                    android:fontFamily="sans-serif-medium"
-                    android:text="@string/arrow"
-                    android:textSize="20sp"
-                    app:layout_constraintBottom_toBottomOf="parent"
-                    app:layout_constraintEnd_toEndOf="parent"
-                    app:layout_constraintTop_toTopOf="parent" />
-            </androidx.constraintlayout.widget.ConstraintLayout>
-
-            <androidx.constraintlayout.widget.ConstraintLayout
-                android:id="@+id/privacy"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:paddingVertical="8dp"
-                android:paddingHorizontal="16dp"
-                android:background="?android:selectableItemBackground">
-
-                <TextView
-                    android:id="@+id/privacy_main"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:fontFamily="sans-serif-medium"
-                    android:paddingStart="2dp"
-                    android:paddingEnd="30dp"
-                    android:text="@string/privacy_policy"
-                    android:textSize="18sp"
-                    app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toTopOf="parent" />
-
-                <TextView
-                    android:id="@+id/privacy_sub"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:paddingStart="2dp"
-                    android:paddingEnd="30dp"
-                    android:text="@string/and_data_usage"
-                    android:textSize="16sp"
-                    app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toBottomOf="@id/privacy_main" />
-
-                <TextView
-                    android:importantForAccessibility="no"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_margin="8dp"
-                    android:fontFamily="sans-serif-medium"
-                    android:text="@string/arrow"
-                    android:textSize="20sp"
-                    app:layout_constraintBottom_toBottomOf="parent"
-                    app:layout_constraintEnd_toEndOf="parent"
-                    app:layout_constraintTop_toTopOf="parent" />
-            </androidx.constraintlayout.widget.ConstraintLayout>
-
-            <androidx.constraintlayout.widget.ConstraintLayout
-                android:id="@+id/donate"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:paddingVertical="8dp"
-                android:paddingHorizontal="16dp"
-                android:background="?android:selectableItemBackground">
-
-                <TextView
-                    android:id="@+id/donate_main"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:fontFamily="sans-serif-medium"
-                    android:paddingStart="2dp"
-                    android:paddingEnd="30dp"
-                    android:text="@string/donate"
-                    android:textSize="18sp"
-                    app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintBottom_toBottomOf="parent"
-                    app:layout_constraintTop_toTopOf="parent" />
-
-                <TextView
-                    android:importantForAccessibility="no"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_margin="8dp"
-                    android:fontFamily="sans-serif-medium"
-                    android:text="@string/arrow"
-                    android:textSize="20sp"
-                    app:layout_constraintBottom_toBottomOf="parent"
-                    app:layout_constraintEnd_toEndOf="parent"
-                    app:layout_constraintTop_toTopOf="parent" />
-            </androidx.constraintlayout.widget.ConstraintLayout>
-
-            <androidx.constraintlayout.widget.ConstraintLayout
-                android:id="@+id/rate"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:paddingVertical="8dp"
-                android:paddingHorizontal="16dp"
-                android:background="?android:selectableItemBackground">
-
-                <TextView
-                    android:id="@+id/rate_main"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:fontFamily="sans-serif-medium"
-                    android:paddingStart="2dp"
-                    android:paddingEnd="30dp"
-                    android:text="@string/rate_this_app"
-                    android:textSize="18sp"
-                    app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toTopOf="parent" />
-
-                <TextView
-                    android:id="@+id/rate_sub"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:paddingStart="2dp"
-                    android:paddingEnd="30dp"
-                    android:text="@string/on_google_play"
-                    android:textSize="16sp"
-                    app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toBottomOf="@id/rate_main" />
-
-                <TextView
-                    android:importantForAccessibility="no"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_margin="8dp"
-                    android:fontFamily="sans-serif-medium"
-                    android:text="@string/arrow"
-                    android:textSize="20sp"
-                    app:layout_constraintBottom_toBottomOf="parent"
-                    app:layout_constraintEnd_toEndOf="parent"
-                    app:layout_constraintTop_toTopOf="parent" />
-            </androidx.constraintlayout.widget.ConstraintLayout>
-
-            <androidx.constraintlayout.widget.ConstraintLayout
-                android:id="@+id/report_error"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:paddingVertical="8dp"
-                android:paddingHorizontal="16dp"
-                android:background="?android:selectableItemBackground">
-
-                <TextView
-                    android:id="@+id/report_error_main"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:fontFamily="sans-serif-medium"
-                    android:paddingStart="2dp"
-                    android:paddingEnd="30dp"
-                    android:text="@string/report_error"
-                    android:textSize="18sp"
-                    app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toTopOf="parent" />
-
-                <TextView
-                    android:id="@+id/report_error_sub"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    app:layout_constraintTop_toBottomOf="@id/report_error_main"
-                    app:layout_constraintStart_toStartOf="parent"
-                    android:paddingStart="2dp"
-                    android:paddingEnd="30dp"
-                    android:textSize="16sp"
-                    android:text="@string/on_github" />
-
-                <TextView
-                    android:importantForAccessibility="no"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_margin="8dp"
-                    android:fontFamily="sans-serif-medium"
-                    android:text="@string/arrow"
-                    android:textSize="20sp"
-                    app:layout_constraintBottom_toBottomOf="parent"
-                    app:layout_constraintEnd_toEndOf="parent"
-                    app:layout_constraintTop_toTopOf="parent" />
-            </androidx.constraintlayout.widget.ConstraintLayout>
-        </LinearLayout>
-    </androidx.core.widget.NestedScrollView>
-</androidx.coordinatorlayout.widget.CoordinatorLayout>

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

@@ -191,6 +191,32 @@
                     </com.google.android.material.textfield.TextInputLayout>
                 </LinearLayout>
 
+                <!-- Barcode encoding -->
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:paddingHorizontal="@dimen/inputPadding"
+                    android:paddingTop="@dimen/inputPadding"
+                    android:orientation="horizontal">
+
+                    <!-- Barcode type -->
+                    <com.google.android.material.textfield.TextInputLayout
+                        android:id="@+id/barcodeEncodingView"
+                        style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.ExposedDropdownMenu"
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1.0"
+                        android:hint="@string/barcodeEncoding"
+                        android:labelFor="@+id/barcodeEncodingField">
+
+                        <AutoCompleteTextView
+                            android:id="@+id/barcodeEncodingField"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:inputType="none"/>
+                    </com.google.android.material.textfield.TextInputLayout>
+                </LinearLayout>
+
                 <!-- Barcode -->
                 <LinearLayout android:orientation="horizontal"
                     android:layout_marginTop="10.0dp"

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

@@ -40,10 +40,16 @@
         android:titleCondensed="@string/unarchive"
         app:showAsAction="never"/>
 
+    <item
+        android:id="@+id/action_duplicate"
+        android:title="@string/duplicateCard"
+        android:titleCondensed="@string/duplicateCard"
+        app:showAsAction="never" />
+
     <item
         android:id="@+id/action_delete"
         android:icon="@drawable/ic_delete_white_24dp"
         android:title="@string/delete"
         android:titleCondensed="@string/delete"
         app:showAsAction="never"/>
-</menu>
+</menu>

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

@@ -21,25 +21,25 @@
         app:showAsAction="always">
 
         <menu>
+            <item
+                android:id="@+id/action_archive"
+                android:title="@string/archive"
+                app:showAsAction="never"/>
+
+            <item
+                android:id="@+id/action_unarchive"
+                android:title="@string/unarchive"
+                app:showAsAction="never"/>
 
             <item
                 android:id="@+id/action_duplicate"
                 android:title="@string/duplicateCard"
                 app:showAsAction="never" />
 
-            <item
-                android:id="@+id/action_archive"
-                android:title="@string/archive"
-                app:showAsAction="never"/>
-            <item
-                android:id="@+id/action_unarchive"
-                android:title="@string/unarchive"
-                app:showAsAction="never"/>
             <item
                 android:id="@+id/action_delete"
                 android:title="@string/delete"
                 app:showAsAction="never"/>
-
         </menu>
 
     </item>

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

@@ -8,9 +8,9 @@ Oğuz Ersen
 FC (Fay) Stegerman
 StoyanDimitrov
 大王叫我来巡山
+B o d o
 SlavekB
 Katharine Chui
-B o d o
 mondstern
 IllusiveMan196
 Silvério Santos
@@ -48,13 +48,13 @@ Balázs Meskó
 Cliff Heraldo
 Sergio Paredes
 Ankit Tiwari
-Arno-github
-Feike Donia
 109247019824
+Feike Donia
+Arno-github
 Jose Delvani
-mdvhimself
 Milan Šalka
 Robin
+mdvhimself
 தமிழ்நேரம்
 damjang
 Govindgopalyadav
@@ -72,11 +72,13 @@ JungHee Lee
 hajertabbane
 inavleb
 Ziad OUALHADJ
+Robin Liu
 Aliaksandr Trush
 Denis Shilin
+Traductor
+Gideon
 Renko
 Ricky Tigg
-Robin Liu
 しいたけ
 Alexander Ivanov
 Miha Frangež
@@ -85,15 +87,13 @@ mrestivill
 ehrt74
 Virginie
 Tim Trek
-Peter Dave Hello
 MisterCosta96
 arshbeerSingh
 Augustin LAVILLE
-Traductor
 Freddo espresso
-Gideon
 vasudev-cell
 Kim Seohyun
 rudy3
 Michael Gangolf
 PRATHAMESH BHAGAT 
+Peter Dave Hello

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

@@ -101,14 +101,6 @@
     <string name="settings_locale">لغة</string>
     <string name="settings_system_locale">النظام</string>
     <string name="setIcon">تعيين الصورة المصغرة</string>
-    <string name="settings_catima_theme">Catima</string>
-    <string name="settings_pink_theme">زهري</string>
-    <string name="settings_magenta_theme">أرجواني</string>
-    <string name="settings_violet_theme">البنفسجي</string>
-    <string name="settings_blue_theme">أزرق</string>
-    <string name="settings_sky_blue_theme">أزرق سماوي</string>
-    <string name="settings_green_theme">أخضر</string>
-    <string name="settings_brown_theme">بني</string>
     <string name="app_contributors">أصبح ممكنًا بواسطة: <xliff:g id="app_contributors">%s</xliff:g></string>
     <string name="sort">فرز</string>
     <string name="showMoreInfo">اظهر المعلومات</string>
@@ -225,7 +217,6 @@
     <string name="failedGeneratingShareURL">تعذر إنشاء عنوان URL قابل للمشاركة</string>
     <string name="help_translate_this_app">ساعد في ترجمة هذا التطبيق</string>
     <string name="on_google_play">على Google Play</string>
-    <string name="settings_theme_color">لون المظهر</string>
     <string name="previousCard">السابق</string>
     <string name="nextCard">التالي</string>
     <string name="failedToRetrieveImageFile">فشل في استخراج ملف الصورة</string>

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

@@ -158,9 +158,6 @@
     <string name="settings_oled_dark">Чысты чорны фон для цёмнай тэмы</string>
     <string name="selectColor">Выбраць колер</string>
     <string name="setIcon">Задаць мініяцюру</string>
-    <string name="settings_theme_color">Колер тэмы</string>
-    <string name="settings_catima_theme">Catima</string>
-    <string name="settings_magenta_theme">Пурпурны</string>
     <string name="app_contributors">Стала магчымым дзякуючы: <xliff:g id="app_contributors">%s</xliff:g></string>
     <string name="sort">Сартаваць</string>
     <string name="showMoreInfo">Паказаць інфармацыю</string>
@@ -275,8 +272,6 @@
     <string name="switchToBackImage">Пераключыцца на задні відарыс</string>
     <string name="importFidmeMessage">Каб імпартаваць, выберыце файл <i>fidme-export-request-xxxxxx.zip</i> з FidMe, а потым уручную выберыце тыпы штрыхкодаў. \nСтварыце яго з вашага профілю FidMe, выбраўшы \"Абарону даных\", а затым націснуўшы \"Выняць мае даныя\".</string>
     <string name="importCatimaMessage">Каб імпартаваць, выберыце файл <i>catima.zip</i> з Catima. \nСтварыце яго з меню \"Імпарт/Экспарт\" іншай праграмы Catima, спачатку націснуўшы там \"Экспарт\".</string>
-    <string name="settings_sky_blue_theme">Нябесна-блакітны</string>
-    <string name="settings_brown_theme">Карычневы</string>
     <string name="switchToBarcode">Пераключыцца на штрыхкод</string>
     <string name="settings_locale">Мова</string>
     <plurals name="groupCardCountWithArchived">
@@ -288,12 +283,8 @@
     <string name="unarchived">Карта разархівавана</string>
     <string name="updateBarcodeQuestionText">Вы змянілі ID. Вы хочаце таксама абнавіць штрыхкод, каб выкарыстоўваць тое ж значэнне?</string>
     <string name="no">Не</string>
-    <string name="settings_pink_theme">Ружовы</string>
     <string name="settings_system_locale">Сістэма</string>
-    <string name="settings_violet_theme">Фіялетавы</string>
     <string name="multipleBarcodesFoundPleaseChooseOne">Які са знойдзеных штрыхкодаў вы хочаце выкарыстоўваць?</string>
-    <string name="settings_blue_theme">Сіні</string>
-    <string name="settings_green_theme">Зялёны</string>
     <string name="report_error">Паведаміць пра памылку</string>
     <string name="failedLaunchingPhotoPicker">Не атрымалася знайсці праграму для галерэі, якая падтрымліваецца</string>
     <string name="unsupportedFile">Гэты файл не падтрымліваецца</string>

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

@@ -143,15 +143,6 @@
         <item quantity="other">Желаете ли тези <xliff:g>%d</xliff:g> карти да бъдат премахнати\?</item>
     </plurals>
     <string name="app_contributors">Осъществено от: <xliff:g id="app_contributors">%s</xliff:g></string>
-    <string name="settings_brown_theme">Кафяво</string>
-    <string name="settings_green_theme">Зелено</string>
-    <string name="settings_sky_blue_theme">Небесносиньо</string>
-    <string name="settings_blue_theme">Синьо</string>
-    <string name="settings_violet_theme">Виолетово</string>
-    <string name="settings_magenta_theme">Цикламено</string>
-    <string name="settings_pink_theme">Розово</string>
-    <string name="settings_catima_theme">Catima</string>
-    <string name="settings_theme_color">Цвят на темата</string>
     <string name="settings_system_locale">Система</string>
     <string name="settings_locale">Език</string>
     <string name="noGroupCards">Групата е празна</string>

app/src/main/res/values-bn-rIN/strings.xml

@@ -50,15 +50,6 @@
     <string name="turn_flashlight_off">টর্চলাইট বন্ধ করুন</string>
     <string name="settings_locale">লোকেল</string>
     <string name="settings_system_locale">সিস্টেম লোকেল</string>
-    <string name="settings_theme_color">থিম রঙ</string>
-    <string name="settings_catima_theme">কটিমা থিম</string>
-    <string name="settings_pink_theme">গোলাপী থিম</string>
-    <string name="settings_magenta_theme">ম্যাজেন্টা থিম</string>
-    <string name="settings_violet_theme">ভায়োলেট থিম</string>
-    <string name="settings_blue_theme">নীল থিম</string>
-    <string name="settings_sky_blue_theme">আকাশী নীল থিম</string>
-    <string name="settings_green_theme">সবুজ থিম</string>
-    <string name="settings_brown_theme">বাদামী থিম</string>
     <string name="sort">সাজান</string>
     <string name="sort_by_name">নামের দ্বারা সাজান</string>
     <string name="sort_by_most_recently_used">সর্বাধিক সম্প্রতি ব্যবহৃত দ্বারা সাজান</string>

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

@@ -2,10 +2,6 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="settings_locale">ভাষা</string>
     <string name="action_search">খুঁজুন</string>
-    <string name="settings_pink_theme">গুলাপি</string>
-    <string name="settings_blue_theme">নীল</string>
-    <string name="settings_green_theme">সবুজ</string>
-    <string name="settings_brown_theme">বাদামি</string>
     <string name="save">সংরক্ষণ</string>
     <string name="cardId">কার্ড আইডি</string>
     <string name="barcodeType">বারকোডের ধরন</string>
@@ -19,7 +15,6 @@
     <string name="all">সকল</string>
     <string name="never">কখনো না</string>
     <string name="currency">মুদ্রা</string>
-    <string name="settings_violet_theme">বেগুনি</string>
     <string name="no">না</string>
     <string name="nextCard">পরবর্তী</string>
     <string name="action_add">যুক্ত করুন</string>

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

@@ -50,15 +50,6 @@
     <string name="turn_flashlight_off">Ugasi lampu</string>
     <string name="settings_locale">Jezik</string>
     <string name="settings_system_locale">Sistem</string>
-    <string name="settings_theme_color">Boja teme</string>
-    <string name="settings_catima_theme">Catima</string>
-    <string name="settings_pink_theme">Ružičasto</string>
-    <string name="settings_magenta_theme">Ljubičasto</string>
-    <string name="settings_violet_theme">Ljubičasto</string>
-    <string name="settings_blue_theme">Plavo</string>
-    <string name="settings_sky_blue_theme">Nebo plavo</string>
-    <string name="settings_green_theme">Zeleno</string>
-    <string name="settings_brown_theme">Braun</string>
     <string name="sort">Poništi sortiranje</string>
     <string name="sort_by_name">Ime</string>
     <string name="sort_by_most_recently_used">Nedavno Korišten</string>

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

@@ -42,10 +42,6 @@
     <string name="leaveWithoutSaveConfirmation">Vols sortir sense grabar?</string>
     <string name="passwordRequired">Introdueixi el password</string>
     <string name="turn_flashlight_on">Encendre el llum flash</string>
-    <string name="settings_magenta_theme">Magenta</string>
-    <string name="settings_violet_theme">Violeta</string>
-    <string name="settings_blue_theme">Blau</string>
-    <string name="settings_green_theme">Verd</string>
     <string name="translate_platform">a la Pàgina Web</string>
     <string name="report_error">Informar un Error</string>
     <string name="archived">Targeta arxivada</string>
@@ -74,7 +70,6 @@
     </plurals>
     <string name="importOptionFilesystemExplanation">Escull un fitxer especific del sistema de fitxers</string>
     <string name="no">No</string>
-    <string name="settings_pink_theme">Rosa</string>
     <string name="sort">Ordenar</string>
     <string name="failedToRetrieveImageFile">Ha fallat l\'obtenció del fitxer d\'imatge</string>
     <string name="barcodeLongPressMessage">Les imatges només es poden obrir desde la app galeria</string>
@@ -146,7 +141,6 @@
     <string name="settings_oled_dark">Negre pur en el tema fosc</string>
     <string name="selectColor">Sel•leccioni el color</string>
     <string name="setIcon">Setegi la miniatura</string>
-    <string name="settings_theme_color">Color del tema</string>
     <string name="app_contributors">Fet possible per: <xliff:g id="app_contributors">%s</xliff:g></string>
     <string name="updateBalance">Actualitzar el balanç</string>
     <string name="sort_by_name">Nom</string>
@@ -176,13 +170,11 @@
     <string name="openFrontImageInGalleryApp">Obrir la imatge frontal a l\'app de galeria</string>
     <string name="settings_use_volume_keys_navigation_summary">Utilitza els botons de volum per canviar la targeta que es mostra</string>
     <string name="updateBarcodeQuestionText">Ha canviat el valor ID. Vol actualitzar també el codi de barres per uter utilitzar el mateix valor?</string>
-    <string name="settings_sky_blue_theme">Blau fluix</string>
     <string name="starred">Preferides</string>
     <string name="deleteConfirmationGroup">Vols eliminar aquest grup?</string>
     <string name="removeImage">Eliminar imatge</string>
     <string name="app_libraries">Llibreries de tercers: <xliff:g id="app_libraries_list">%s</xliff:g></string>
     <string name="settings_display_barcode_max_brightness">Màxima iluminació</string>
-    <string name="settings_brown_theme">Marró</string>
     <string name="manually_enter_barcode_instructions">Introdueixi el ID de la targeta manualment i trii un codi de barres que s\'assembli al de la seva targeta.</string>
     <string name="rate_this_app">Valora aquesta app</string>
     <string name="exportPasswordHint">Introdueixi el password</string>
@@ -236,7 +228,6 @@
     <string name="turn_flashlight_off">Apagar el llum Flash</string>
     <string name="settings_oled_dark_summary">Redueix l\'ús de la bateria en pantalles OLED</string>
     <string name="settings_system_locale">Idioma del sistema</string>
-    <string name="settings_catima_theme">Catima</string>
     <string name="spend">Gastar</string>
     <string name="importExportHelp">Fer una còpia de seguretat de les dades permet moure-les a un altre dispositiu</string>
     <string name="importSuccessfulTitle">Importat</string>

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

@@ -83,15 +83,6 @@
     <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="settings_brown_theme">Hnědá</string>
-    <string name="settings_green_theme">Zelená</string>
-    <string name="settings_sky_blue_theme">Azurová</string>
-    <string name="settings_blue_theme">Modrá</string>
-    <string name="settings_violet_theme">Fialová</string>
-    <string name="settings_magenta_theme">Purpurová</string>
-    <string name="settings_pink_theme">Růžová</string>
-    <string name="settings_catima_theme">Catima</string>
-    <string name="settings_theme_color">Barva motivu</string>
     <string name="settings_system_locale">Podle systému</string>
     <string name="settings_locale">Jazyk</string>
     <string name="turn_flashlight_off">Vypnout světlo</string>

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

@@ -144,15 +144,6 @@
     </plurals>
     <string name="settings_system_locale">System</string>
     <string name="settings_locale">Sprache</string>
-    <string name="settings_brown_theme">Braun</string>
-    <string name="settings_green_theme">Grün</string>
-    <string name="settings_sky_blue_theme">Himmelblau</string>
-    <string name="settings_blue_theme">Blau</string>
-    <string name="settings_violet_theme">Violett</string>
-    <string name="settings_magenta_theme">Magenta</string>
-    <string name="settings_pink_theme">Rosa</string>
-    <string name="settings_catima_theme">Catima</string>
-    <string name="settings_theme_color">Designfarbe</string>
     <string name="app_contributors">Ermöglicht durch: <xliff:g id="app_contributors">%s</xliff:g></string>
     <string name="barcodeImageDescriptionWithType">Bild <xliff:g>%s</xliff:g> Barcode</string>
     <string name="sort_by">Sortieren nach</string>

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

@@ -137,9 +137,6 @@
     <string name="app_resources">Πηγές τρίτων: <xliff:g id="app_resources_list">%s</xliff:g></string>
     <string name="selectColor">Επιλογή χρώματος</string>
     <string name="setIcon">Ορισμός εικονιδίου</string>
-    <string name="settings_sky_blue_theme">Γαλάζιο</string>
-    <string name="settings_green_theme">Πράσινο</string>
-    <string name="settings_brown_theme">Καφέ</string>
     <string name="sort_by_expiry">Λήξη</string>
     <plurals name="groupCardCount">
         <item quantity="one"><xliff:g>%d</xliff:g> κάρτα</item>
@@ -187,12 +184,6 @@
     <string name="settings_locale">Γλώσσα</string>
     <string name="settings_oled_dark">Απόλυτο μαύρο φόντο για το μαύρο θέμα</string>
     <string name="settings_system_locale">Σύστημα</string>
-    <string name="settings_theme_color">Χρώμα θέματος</string>
-    <string name="settings_catima_theme">Κάτιμα</string>
-    <string name="settings_pink_theme">Ροζ</string>
-    <string name="settings_magenta_theme">Φούξια</string>
-    <string name="settings_violet_theme">Βιολετί</string>
-    <string name="settings_blue_theme">Μπλε</string>
     <string name="app_contributors">Δημιουργήθηκε από: <xliff:g id="app_contributors">%s</xliff:g></string>
     <string name="showMoreInfo">Εμφάνιση πληροφοριών</string>
     <string name="sort_by_name">Όνομα</string>

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

@@ -101,7 +101,6 @@
     <string name="balance">Saldo</string>
     <string name="moveBarcodeToTopOfScreen">Movi la strekodon al la supro de la ekrano</string>
     <string name="errorReadingImage">Ne eblis legi bildon</string>
-    <string name="settings_brown_theme">Bruna</string>
     <string name="showMoreInfo">Montri informojn</string>
     <string name="on_github">sur GitHub</string>
     <string name="archive">Enarkivigi</string>
@@ -127,7 +126,6 @@
     <string name="validFromDate">Valida ekde</string>
     <string name="accept">Akcepti</string>
     <string name="app_loyalty_card_keychain">Loyalty Card Keychain</string>
-    <string name="settings_sky_blue_theme">Ĉielblua</string>
     <string name="unarchive">Elarkivigi</string>
     <string name="switchToBarcode">Ŝanĝi al strikodo</string>
     <string name="currentBalanceSentence">Nuna saldo: <xliff:g>%s</xliff:g></string>
@@ -166,7 +164,6 @@
     <string name="balanceParsingFailed">Nevalida saldo</string>
     <string name="chooseImportType">Importi datumojn de</string>
     <string name="importCatima">Importi el Catima</string>
-    <string name="settings_green_theme">Verda</string>
     <string name="updateBalance">Ĝisdatigi saldon</string>
     <string name="barcodeLongPressMessage">Nur bildoj povas esti malfermitaj en la galeria apo</string>
     <string name="sort_by_name">Nomo</string>
@@ -225,8 +222,6 @@
     <string name="settings_oled_dark_summary">Malpligrandigas baterian uzadon sur OLED-ekranoj</string>
     <string name="selectColor">Elekti koloron</string>
     <string name="setIcon">Starigi bildeton</string>
-    <string name="settings_catima_theme">Catima</string>
-    <string name="settings_pink_theme">Rozkolora</string>
     <string name="field_must_not_be_empty">Kampo devas ne esti malplena</string>
     <string name="manually_enter_barcode_instructions">Entajpu la identigilon aŭ tekston sur via karto kaj premu la strikodon kiu aspektas kiel tiu sur via karto.</string>
     <string name="turn_flashlight_off">Malŝalti poŝlampon</string>
@@ -241,7 +236,6 @@
     <string name="wrongValueForBarcodeType">La valoro ne validas por la elektita tipo de strikodo</string>
     <string name="importCancelled">Importado nuligita</string>
     <string name="exportCancelled">Eksportado nuligita</string>
-    <string name="settings_theme_color">Koloro de la temo</string>
     <string name="app_libraries">Liberaj triaj bibliotekoj: <xliff:g id="app_libraries_list">%s</xliff:g></string>
     <string name="addFromPdfFile">Elekti PDF-dosieron</string>
     <string name="failedLaunchingFileManager">Subtenata dosiermastrumilo ne trovebla</string>
@@ -267,9 +261,6 @@
     <string name="importVoucherVault">Importi el Voucher Vault</string>
     <string name="turn_flashlight_on">Enŝalti poŝlampon</string>
     <string name="settings_locale">Lingvo</string>
-    <string name="settings_magenta_theme">Maĝenta</string>
-    <string name="settings_violet_theme">Viola</string>
-    <string name="settings_blue_theme">Blua</string>
     <string name="enter_card_id">Entajpu la identigilon aŭ tekston sur via karto</string>
     <string name="card_id_must_not_be_empty">Identigilo devas ne esti malplena</string>
     <string name="add_a_card_in_a_different_way">Aldoni karton alimaniere</string>

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

@@ -169,11 +169,7 @@
     <string name="updateBarcodeQuestionText">Has cambiado el ID. ¿Quieres actualizar también el código de barras para usar el mismo valor?</string>
     <string name="settings_locale">Idioma</string>
     <string name="settings_system_locale">Sistema</string>
-    <string name="settings_catima_theme">Catima</string>
-    <string name="settings_pink_theme">Rosa</string>
     <string name="exportPassword">Configura una contraseña para proteger tu exportación (opcional)</string>
-    <string name="settings_sky_blue_theme">Celeste</string>
-    <string name="settings_green_theme">Verde</string>
     <string name="exportPasswordHint">Ingresar contraseña</string>
     <string name="setIcon">Establecer miniatura</string>
     <string name="showMoreInfo">Mostrar información</string>
@@ -184,12 +180,7 @@
     <string name="settings_oled_dark_summary">Reduce uso de batería en pantallas OLED</string>
     <string name="settings_oled_dark">Fondo negro puro para tema oscuro</string>
     <string name="selectColor">Seleccionar color</string>
-    <string name="settings_theme_color">Color del tema</string>
-    <string name="settings_magenta_theme">Magenta</string>
-    <string name="settings_violet_theme">Violeta</string>
-    <string name="settings_brown_theme">Marrón</string>
     <string name="sort">Ordenar</string>
-    <string name="settings_blue_theme">Azul</string>
     <string name="app_contributors">Hecho posible por: <xliff:g id="app_contributors">%s</xliff:g></string>
     <string name="barcodeLongPressMessage">Solo se puede abrir imágenes en la aplicación de galería</string>
     <string name="yes">Si</string>

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

@@ -147,15 +147,6 @@
         <item quantity="other">Borrar <xliff:g>%d</xliff:g> tarjetas</item>
     </plurals>
     <string name="app_contributors">Hecho posible por: <xliff:g id="app_contributors">%s</xliff:g></string>
-    <string name="settings_brown_theme">Marrón</string>
-    <string name="settings_green_theme">Verde</string>
-    <string name="settings_sky_blue_theme">Azul cielo</string>
-    <string name="settings_blue_theme">Azul</string>
-    <string name="settings_violet_theme">Violeta</string>
-    <string name="settings_magenta_theme">Magenta</string>
-    <string name="settings_pink_theme">Rosa</string>
-    <string name="settings_theme_color">Color del tema</string>
-    <string name="settings_catima_theme">Catima</string>
     <string name="settings_system_locale">Sistema</string>
     <string name="settings_locale">Idioma</string>
     <string name="noGroupCards">Este grupo está vacío</string>
@@ -311,4 +302,7 @@
     <string name="acra_crash_email_subject">Reporte del fallo <xliff:g id="app_name">%s</xliff:g></string>
     <string name="pref_enable_acra">Solicitar envío de reportes de fallos</string>
     <string name="pref_enable_acra_summary">Cuando está activado, se le pedirá que informe sobre un fallo cuando ocurra. Los informes de fallo nunca se envían automáticamente.</string>
+    <string name="copy_value">Copia valor</string>
+    <string name="copied_to_clipboard">Copiado al portapapeles</string>
+    <string name="nothing_to_copy">Ningún valor encontrado</string>
 </resources>

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

@@ -118,8 +118,6 @@
     <string name="updateBarcodeQuestionTitle">Kas uuendame triipkoodi väärtust?</string>
     <string name="yes">Jah</string>
     <string name="no">Ei</string>
-    <string name="settings_theme_color">Kujunduse värv</string>
-    <string name="settings_pink_theme">Roosa</string>
     <string name="barcodeLongPressMessage">Galeriirakenduses saad avada vaid pilte</string>
     <string name="sort_by_most_recently_used">Viimati kasutatud</string>
     <string name="sort_by_expiry">Aegumine</string>
@@ -201,13 +199,6 @@
     <string name="settings_system_locale">Süsteemi keel</string>
     <string name="selectColor">Vali värv</string>
     <string name="setIcon">Lisa pisipilt</string>
-    <string name="settings_catima_theme">Catima</string>
-    <string name="settings_magenta_theme">Fuksiapunane</string>
-    <string name="settings_violet_theme">Punakassinine</string>
-    <string name="settings_blue_theme">Sinine</string>
-    <string name="settings_sky_blue_theme">Taevasinine</string>
-    <string name="settings_green_theme">Roheline</string>
-    <string name="settings_brown_theme">Pruun</string>
     <string name="app_contributors">Seda rakendust on aidanud teha: <xliff:g id="app_contributors">%s</xliff:g></string>
     <string name="sort">Järjesta</string>
     <string name="updateBalance">Uuenda maksejääki</string>

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

@@ -36,7 +36,7 @@
     <string name="scanCardBarcode">اسکن بارکد</string>
     <string name="cardShortcut">میان‌بر کارت</string>
     <string name="noCardsMessage">ابتدا یک کارت بیافزایید</string>
-    <string name="noCardExistsError">کارت پیدا نشد</string>
+    <string name="noCardExistsError">آن کارت پیدا نشد</string>
     <string name="importFailedTitle">ایمپورت ناموفق بود</string>
     <string name="importFailed">نمیتوان ایمپورت کرد</string>
     <string name="exportSuccessfulTitle">خروجی گرفته شده</string>
@@ -68,7 +68,7 @@
     <string name="permissionReadCardsDescription">کارت های کاتیما و تمام جزئیاتشان از جمله یادداشت‌ها و عکس‌ها را بخوانید</string>
     <string name="cameraPermissionDeniedTitle">نمیتوان به دوربین دسترسی پیدا کرد</string>
     <string name="noCameraPermissionDirectToSystemSetting">برای اسکن بارکد ها، کاتیما نیاز دارد به دوربین شما دسترسی داشته باشد. اینجا بزنید تا تنظیمات دسترسی خود را تغییر دهید.</string>
-    <string name="importExport">ایمپورت/خروجی گرفتن</string>
+    <string name="importExport">واردات/صادرات</string>
     <string name="settings_category_title_privacy">حریم شخصی</string>
     <string name="settings_category_title_general">عمومی</string>
     <string name="settings_category_title_cards">نمایش کارت</string>
@@ -117,8 +117,8 @@
     <string name="importCatimaMessage">فایل <i>catima.zip</i> خروجی خود را از Catima برای وارد کردن انتخاب کنید.\nآن را از منوی وارد/صادر کردن در یک اپلیکیشن دیگر Catima با فشردن دکمه صادرکردن ابتدا ایجاد کنید.</string>
     <string name="unsupportedBarcodeType">این نوع بارکد هنوز نمی‌تواند نمایش داده شود. ممکن است در نسخه آینده برنامه پشتیبانی شود.</string>
     <plurals name="balancePoints">
-        <item quantity="one"><xliff:g>%s</xliff:g> امتیاز</item>
-        <item quantity="other"><xliff:g>%s</xliff:g> امتیاز</item>
+        <item quantity="one"><xliff:g>%s</xliff:g> نقطه</item>
+        <item quantity="other"><xliff:g>%s</xliff:g> نقطه</item>
     </plurals>
     <string name="importFidmeMessage">فایل خروجی <i>fidme-export-request-xxxxxx.zip</i> خود را از FidMe برای وارد کردن انتخاب کنید، و سپس نوع بارکدها را به صورت دستی مشخص کنید.\nآن را از پروفایل FidMe خود با انتخاب گزینه حفاظت از داده و سپس فشار دادن گزینه استخراج داده من ابتدا ایجاد کنید.</string>
     <string name="leaveWithoutSaveTitle">خروج</string>
@@ -180,7 +180,6 @@
     <string name="height">ارتفاع</string>
     <string name="add_manually_warning_message">برای برخی از فروشگاه‌ها، مقدار بارکد با عدد نوشته شده روی کارت متفاوت است. به همین دلیل، وارد کردن دستی بارکد ممکن است همیشه کار نکند. اکیداً توصیه می‌شود که به جای آن، بارکد را با دوربین خود اسکن کنید. آیا هنوز می‌خواهید ادامه دهید؟</string>
     <string name="generic_error_please_retry">ببخشید، مشکلی پیش آمده، لطفا دوباره امتحان کنید...</string>
-    <string name="settings_magenta_theme">سرخابی</string>
     <string name="welcome">یه کتیما خوش آمدید</string>
     <string name="chooseValidFromDate">مقداری درست از تاریخ برگزینید</string>
     <string name="intent_import_card_from_url_share_multiple_text">می‌خواهم چند کارت به شما بدهم</string>
@@ -198,15 +197,8 @@
     <string name="settings_oled_dark">پس‌زمینه‌ی یک‌دست سیاه برای حالت تاریک</string>
     <string name="settings_oled_dark_summary">استفاده‌ی باتری را برای نمایشگرهای OLED کاهش می‌دهد</string>
     <string name="setIcon">قالب پیش‌نمایه را بگمارید</string>
-    <string name="settings_theme_color">رنگ زمینه</string>
-    <string name="settings_catima_theme">کتیما</string>
     <string name="settings_system_locale">سیستم</string>
     <string name="selectColor">رنگ را برگزینید</string>
-    <string name="settings_violet_theme">بنفش</string>
-    <string name="settings_blue_theme">آبی</string>
-    <string name="settings_sky_blue_theme">آبی آسمانی</string>
-    <string name="settings_green_theme">سبز</string>
-    <string name="settings_brown_theme">قهوه‌ای</string>
     <string name="app_contributors">با کمک او ممکن شد: <xliff:g id="app_contributors">%s</xliff:g></string>
     <string name="sort">مرتب‌کردن</string>
     <string name="showMoreInfo">نمایش اطلاعات</string>
@@ -220,7 +212,6 @@
     <string name="passwordRequired">لطفا گذرواژه را وارد کنید</string>
     <string name="previousCard">پیشین</string>
     <string name="turn_flashlight_off">چراغ‌قوه را خاموش کنید</string>
-    <string name="settings_pink_theme">صورتی</string>
     <string name="updateBalance">به‌روزرسانی موجودی</string>
     <string name="barcodeLongPressMessage">تنها عکس می‌تواند در گالری برنامه باز شود</string>
     <string name="sort_by_name">نام</string>
@@ -294,4 +285,5 @@
     <string name="spend">خرج کردن</string>
     <string name="addFromPkpass">یک فایل دفترچه حساب (.pkpass) انتخاب کنید</string>
     <string name="noCameraFoundGuideText">به نظر نمی‌رسد دستگاه شما دوربین داشته باشد. اگر دارد، دستگاه را مجدداً راه‌اندازی کنید. در غیر این صورت، از دکمه گزینه‌های بیشتر در زیر برای افزودن بارکد به روش دیگری استفاده کنید.</string>
+    <string name="card_list_widget_empty">بعد از اینکه چند کارت وفاداری در کاتیما اضافه کردید، آنها اینجا ظاهر می‌شوند. اگر کارت دارید، مطمئن شوید که همه آنها بایگانی نشده‌اند.</string>
 </resources>

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

@@ -147,15 +147,6 @@
     <string name="turn_flashlight_on">Käytä taskulamppua</string>
     <string name="turn_flashlight_off">Sammuta salamavalo</string>
     <string name="app_contributors">Mahdollistanut: <xliff:g id="app_contributors">%s</xliff:g></string>
-    <string name="settings_brown_theme">Ruskea</string>
-    <string name="settings_green_theme">Vihreä</string>
-    <string name="settings_sky_blue_theme">Taivaansininen</string>
-    <string name="settings_blue_theme">Siniset</string>
-    <string name="settings_violet_theme">Violetti</string>
-    <string name="settings_magenta_theme">Magenta</string>
-    <string name="settings_pink_theme">Pinkki</string>
-    <string name="settings_theme_color">Teeman väri</string>
-    <string name="settings_catima_theme">Catima</string>
     <string name="settings_system_locale">Järjestelmä</string>
     <string name="settings_locale">Kieli</string>
     <string name="noGroupCards">Tämä ryhmä on tyhjä</string>

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

@@ -147,15 +147,6 @@
     </plurals>
     <string name="settings_system_locale">Système</string>
     <string name="settings_locale">Langue</string>
-    <string name="settings_brown_theme">Marron</string>
-    <string name="settings_green_theme">Vert</string>
-    <string name="settings_sky_blue_theme">Bleu ciel</string>
-    <string name="settings_blue_theme">Bleu</string>
-    <string name="settings_violet_theme">Violet</string>
-    <string name="settings_magenta_theme">Magenta</string>
-    <string name="settings_pink_theme">Rose</string>
-    <string name="settings_catima_theme">Catima</string>
-    <string name="settings_theme_color">Couleur du thème</string>
     <string name="app_contributors">Rendu possible par : <xliff:g id="app_contributors">%s</xliff:g></string>
     <string name="noGroupCards">Ce groupe est vide</string>
     <string name="barcodeImageDescriptionWithType">Image <xliff:g>%s</xliff:g> code-barres</string>

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

@@ -145,14 +145,6 @@
     <string name="settings_oled_dark_summary">Diminúe o uso da batería nas pantallas OLED</string>
     <string name="settings_system_locale">Sistema</string>
     <string name="selectColor">Elixir cor</string>
-    <string name="settings_theme_color">Cor do decorado</string>
-    <string name="settings_catima_theme">Catima</string>
-    <string name="settings_pink_theme">Rosa</string>
-    <string name="settings_magenta_theme">Maxenta</string>
-    <string name="settings_violet_theme">Violeta</string>
-    <string name="settings_sky_blue_theme">Azul celeste</string>
-    <string name="settings_green_theme">Verde</string>
-    <string name="settings_brown_theme">Marrón</string>
     <string name="app_contributors">Creada grazas a: <xliff:g id="app_contributors">%s</xliff:g></string>
     <string name="sort">Orde</string>
     <string name="showMoreInfo">Ver info</string>
@@ -269,7 +261,6 @@
     <string name="deleteConfirmationGroup">Eliminar grupo?</string>
     <string name="failedOpeningFileManager">Non puido abrir un xestor de ficheiros</string>
     <string name="settings_locale">Idioma</string>
-    <string name="settings_blue_theme">Azul</string>
     <string name="passwordRequired">Escribe o contrasinal</string>
     <string name="exportPassword">Establece un contrasinal para protexer a exportación (optativo)</string>
     <string name="exportPasswordHint">Escribe o contrasinal</string>

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

@@ -170,28 +170,19 @@
     <string name="action_more_options">अधिक विकल्प</string>
     <string name="frontImageDescription">सामने की छवि</string>
     <string name="anyDate">कोई दिन</string>
-    <string name="settings_green_theme">हरा</string>
-    <string name="settings_pink_theme">गुलाबी</string>
     <string name="action_display_options">प्रदर्शन विकल्प</string>
     <string name="settings_category_title_cards">कार्ड</string>
     <string name="addWithoutBarcode">बिना बारकोड वाला कार्ड जोड़ें</string>
     <string name="on_google_play">गूगल प्ले पर</string>
     <string name="report_error">गलती की रिपोर्ट करें</string>
     <string name="passwordRequired">कृपया पासवर्ड दर्ज करें</string>
-    <string name="settings_brown_theme">भूरा</string>
     <string name="field_must_not_be_empty">फ़ील्ड खाली नहीं होनी चाहिए</string>
-    <string name="settings_catima_theme">कैटिमा</string>
     <string name="options">विकल्प</string>
-    <string name="settings_magenta_theme">मैजेंटा</string>
     <string name="failedGeneratingShareURL">साझा करने योग्य URL जनरेट नहीं किया जा सकता. कृपया इसकी रिपोर्ट करें</string>
     <string name="sort_by_most_recently_used">सबसे हाल ही में उपयोग किया गया</string>
-    <string name="settings_theme_color">थीम का रंग</string>
-    <string name="settings_sky_blue_theme">आसमानी नीला (हल्का नीला)</string>
     <string name="updateBalanceHint">राशि डालें</string>
     <string name="on_github">गिटहब पर</string>
     <string name="donate">दान करें /भेंट दें</string>
-    <string name="settings_violet_theme">बैंगनी</string>
-    <string name="settings_blue_theme">नीला</string>
     <string name="shortcutSelectCard">एक कार्ड चुनें</string>
     <string name="settings_category_title_privacy">गोपनीयता</string>
     <string name="show_balance">शेष राशि दिखाएं</string>

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

@@ -88,8 +88,6 @@
     <string name="importCards">Uvezi kartice</string>
     <string name="selectColor">Odaberi boju</string>
     <string name="setIcon">Postavi sličicu</string>
-    <string name="settings_catima_theme">Catima</string>
-    <string name="settings_green_theme">Zelena</string>
     <string name="sort_by_expiry">Istek</string>
     <string name="barcodeImageDescriptionWithType">Slika vrste crtičnog koda <xliff:g>%s</xliff:g></string>
     <string name="importLoyaltyCardKeychain">Uvezi iz Loyalty Card Keychain</string>
@@ -99,9 +97,6 @@
     <string name="failedGeneratingShareURL">Nije bilo moguće generirati URL za dijeljenje</string>
     <string name="turn_flashlight_off">Isključi bljeskalicu</string>
     <string name="settings_locale">Jezik</string>
-    <string name="settings_magenta_theme">Magenta</string>
-    <string name="settings_violet_theme">Ljubičasta</string>
-    <string name="settings_sky_blue_theme">Nebesko plava</string>
     <string name="sort">Razvrstaj</string>
     <string name="updateBalance">Aktualiziraj saldo</string>
     <string name="sort_by">Razvrstaj po</string>
@@ -162,8 +157,6 @@
     <string name="balanceSentence">Saldo: <xliff:g>%s</xliff:g></string>
     <string name="importFidmeMessage">Odaberi tvoj izvoz iz FidMe za uvoz i ručno odaberi vste crtičnog koda nakon toga. \nStvori ga putem tvog FidMe profila biranjem „Zaštita podataka” a zatim pritisni „Dekomprimiraj moje podatke”.</string>
     <string name="importVoucherVaultMessage">Odaberi tvoj izvoz iz Voucher Vault za uvoz. \nStvori ga u aplikaciji Voucher Vault pritiskom na „Izvoz”.</string>
-    <string name="settings_pink_theme">Ružičasta</string>
-    <string name="settings_blue_theme">Plava</string>
     <string name="failedToRetrieveImageFile">Neuspjelo dohvaćanje slikovne datoteke</string>
     <string name="license">Licenca</string>
     <string name="barcodeLongPressMessage">U aplikaciji galerije se mogu otvoriiti samo slike</string>
@@ -223,8 +216,6 @@
     <string name="passwordRequired">Upiši lozinku</string>
     <string name="exportPassword">Postavi lozinku za zaštitu tvog izvoza (opcionalno)</string>
     <string name="settings_oled_dark">Potpuno crna pozadina za tamnu temu</string>
-    <string name="settings_theme_color">Boja teme</string>
-    <string name="settings_brown_theme">Smeđa</string>
     <string name="app_contributors">Doprinositelji: <xliff:g id="app_contributors">%s</xliff:g></string>
     <string name="showMoreInfo">Prikaži informacije</string>
     <string name="sort_by_name">Ime</string>

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

@@ -52,14 +52,11 @@
     <string name="noCardExistsError">A kártya nem található</string>
     <string name="importVoucherVault">Importálás a Voucher Vaultból</string>
     <string name="wrongValueForBarcodeType">Ez az érték meg megfelelő a kiválasztott vonalkódtí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">Adja meg a jelszót</string>
-    <string name="settings_catima_theme">Catima</string>
     <string name="exportPasswordHint">Kód beírása</string>
     <string name="failedGeneratingShareURL">Nem lehetett megosztható webcímet előállítani. Kérjük, ezt jelentse.</string>
-    <string name="settings_theme_color">Téma színe</string>
     <string name="sort">Rendezés</string>
     <string name="on_google_play">a Google Playen</string>
     <string name="and_data_usage">és adathasználat</string>
@@ -146,12 +143,6 @@
     <string name="settings_system_locale">Rendszer</string>
     <string name="selectColor">Szín kiválasztása</string>
     <string name="setIcon">Miniatűr beállítása</string>
-    <string name="settings_pink_theme">Rózsaszín</string>
-    <string name="settings_magenta_theme">Bíbor</string>
-    <string name="settings_violet_theme">Ibolya</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é tették: <xliff:g id="app_contributors">%s</xliff:g></string>
     <string name="showMoreInfo">Információk megjelenítése</string>
     <string name="reverse">…fordított sorrendben</string>

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

@@ -50,15 +50,6 @@
     <string name="rate_this_app">Beri nilai pada aplikasi ini</string>
     <string name="sort_by_expiry">Masa berlaku</string>
     <string name="sort_by_most_recently_used">Yang paling baru digunakan</string>
-    <string name="settings_catima_theme">Catima</string>
-    <string name="settings_pink_theme">Merah Muda</string>
-    <string name="settings_blue_theme">Biru</string>
-    <string name="settings_green_theme">Hijau</string>
-    <string name="settings_sky_blue_theme">Biru Langit</string>
-    <string name="settings_brown_theme">Cokelat</string>
-    <string name="settings_violet_theme">Ungu</string>
-    <string name="settings_magenta_theme">Magenta</string>
-    <string name="settings_theme_color">Warna tema</string>
     <string name="settings_system_locale">Sistem</string>
     <string name="settings_locale">Bahasa</string>
     <string name="turn_flashlight_on">Hidupkan lampu flash</string>

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

@@ -76,11 +76,7 @@
         <item quantity="other"><xliff:g>%d</xliff:g> valin</item>
     </plurals>
     <string name="noGiftCardsGroup">Búðu til nokkur kort og settu þau síðan í hópinn hér.</string>
-    <string name="settings_brown_theme">Brún</string>
-    <string name="settings_green_theme">Grænn</string>
     <string name="sort">flokka</string>
     <string name="sort_by">flokka Eftir</string>
     <string name="nextCard">Næsta</string>
-    <string name="settings_blue_theme">Blár</string>
-    <string name="settings_sky_blue_theme">Himinblár</string>
 </resources>

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

@@ -151,15 +151,6 @@
     </plurals>
     <string name="settings_system_locale">Sistema</string>
     <string name="settings_locale">Lingua</string>
-    <string name="settings_brown_theme">Marrone</string>
-    <string name="settings_green_theme">Verde</string>
-    <string name="settings_sky_blue_theme">Azzurro</string>
-    <string name="settings_blue_theme">Blu</string>
-    <string name="settings_violet_theme">Viola</string>
-    <string name="settings_magenta_theme">Magenta</string>
-    <string name="settings_pink_theme">Rosa</string>
-    <string name="settings_catima_theme">Catima</string>
-    <string name="settings_theme_color">Colore del tema</string>
     <string name="app_contributors">Reso possibile da: <xliff:g id="app_contributors">%s</xliff:g></string>
     <string name="noGroupCards">Questo gruppo è vuoto</string>
     <string name="barcodeImageDescriptionWithType">Immagine del codice a barre in formato <xliff:g>%s</xliff:g></string>

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

@@ -137,15 +137,6 @@
     </plurals>
     <string name="barcodeImageDescriptionWithType">バーコード形式の画像 <xliff:g>%s</xliff:g></string>
     <string name="app_contributors">Made possible by: <xliff:g id="app_contributors">%s</xliff:g></string>
-    <string name="settings_brown_theme">ブラウン/茶色</string>
-    <string name="settings_green_theme">グリーン/緑色</string>
-    <string name="settings_sky_blue_theme">スカイブルー/水色</string>
-    <string name="settings_blue_theme">ブルー/青色</string>
-    <string name="settings_violet_theme">バイオレット/菫色</string>
-    <string name="settings_magenta_theme">マゼンタ/赤紫色</string>
-    <string name="settings_pink_theme">ピンク/桃色</string>
-    <string name="settings_catima_theme">Catimaテーマ</string>
-    <string name="settings_theme_color">テーマカラー</string>
     <string name="settings_system_locale">システムに従う</string>
     <string name="settings_locale">言語</string>
     <string name="noGroupCards">このグループにはカードがありません</string>

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

@@ -87,12 +87,6 @@
     <string name="settings_locale">언어</string>
     <string name="settings_system_locale">시스템</string>
     <string name="selectColor">색상 선택</string>
-    <string name="settings_theme_color">테마 색상</string>
-    <string name="settings_catima_theme">Catima</string>
-    <string name="settings_pink_theme">핑크색</string>
-    <string name="settings_magenta_theme">자홍색</string>
-    <string name="settings_violet_theme">보라색</string>
-    <string name="settings_blue_theme">파란색</string>
     <string name="app_contributors">기여자: <xliff:g id="app_contributors">%s</xliff:g></string>
     <string name="showMoreInfo">정보 보기</string>
     <string name="updateBalance">잔액 업데이트</string>
@@ -228,9 +222,6 @@
     <string name="importVoucherVaultMessage">가져올 Voucher Vault에서 <i>vouchervault.json</i> 내보내기를 선택합니다.
 \n먼저 바우처 금고에서 내보내기를 눌러 생성하세요.</string>
     <string name="sameAsCardId">아이디와 동일</string>
-    <string name="settings_sky_blue_theme">하늘색</string>
-    <string name="settings_green_theme">초록색</string>
-    <string name="settings_brown_theme">갈색</string>
     <string name="previousCard">이전의</string>
     <string name="nextCard">다음</string>
     <string name="failedToOpenUrl">먼저 웹 브라우저를 설치하십시오</string>

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

@@ -152,15 +152,6 @@
     </plurals>
     <string name="settings_system_locale">Sistemos</string>
     <string name="settings_locale">Kalba</string>
-    <string name="settings_brown_theme">Ruda</string>
-    <string name="settings_green_theme">Žalia</string>
-    <string name="settings_sky_blue_theme">Dangaus mėlynumo</string>
-    <string name="settings_blue_theme">Mėlyna</string>
-    <string name="settings_violet_theme">Violetinė</string>
-    <string name="settings_magenta_theme">Rausvai raudona</string>
-    <string name="settings_pink_theme">Rožinė</string>
-    <string name="settings_catima_theme">Catima</string>
-    <string name="settings_theme_color">Temos spalva</string>
     <string name="app_contributors">Tapo įmanoma su pagalba: <xliff:g id="app_contributors">%s</xliff:g></string>
     <string name="noGroupCards">Grupėje yra tuščia</string>
     <string name="barcodeImageDescriptionWithType"><xliff:g>%s</xliff:g> brūkšninio kodo vaizdas</string>

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

@@ -98,11 +98,6 @@
     <string name="about_title_fmt">Par <xliff:g id="app_name">%s</xliff:g></string>
     <string name="expiryStateSentenceExpired">Derīgums beidzās: <xliff:g>%s</xliff:g></string>
     <string name="selectColor">Atlasīt krāsu</string>
-    <string name="settings_catima_theme">Catima</string>
-    <string name="settings_pink_theme">Rozā</string>
-    <string name="settings_magenta_theme">Purpura</string>
-    <string name="settings_sky_blue_theme">Gaiši zila</string>
-    <string name="settings_green_theme">Zaļa</string>
     <string name="sort_by_name">Nosaukums</string>
     <string name="on_google_play">pakalpojumā Google Play</string>
     <string name="report_error">Ziņot par kļūdu</string>
@@ -150,7 +145,6 @@
     <string name="privacy_policy">Privātuma politika</string>
     <string name="accept">Pieņemt</string>
     <string name="editGroup">Kopas labošana: <xliff:g>%s</xliff:g></string>
-    <string name="settings_brown_theme">Brūna</string>
     <string name="app_copyright_fmt" tools:ignore="PluralsCandidate">Autortiesības © 2019–<xliff:g>%d</xliff:g> Sylvia van Os</string>
     <string name="app_copyright_old">Balstīta uz Loyalty Card Keychain
 \nautortiesības © 2016–2020 Branden Archer</string>
@@ -191,9 +185,6 @@
     <string name="turn_flashlight_on">Ieslēgt zibspuldzi</string>
     <string name="settings_oled_dark">Tīri melns fons tumšajam izskatam</string>
     <string name="setIcon">Iestatīt sīktēlu</string>
-    <string name="settings_theme_color">Izskata krāsa</string>
-    <string name="settings_violet_theme">Violeta</string>
-    <string name="settings_blue_theme">Zila</string>
     <string name="sort">Kārtot</string>
     <string name="showMoreInfo">Rādīt informāciju</string>
     <string name="sort_by_most_recently_used">Visnesenāk izmantotās</string>

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

@@ -146,16 +146,7 @@
     </plurals>
     <string name="settings_system_locale">System</string>
     <string name="settings_locale">Språk</string>
-    <string name="settings_violet_theme">Fiolett</string>
-    <string name="settings_magenta_theme">Magentarød</string>
     <string name="app_contributors">Muliggjort av: <xliff:g id="app_contributors">%s</xliff:g></string>
-    <string name="settings_brown_theme">Brun</string>
-    <string name="settings_green_theme">Grønn</string>
-    <string name="settings_sky_blue_theme">Himmelblå</string>
-    <string name="settings_blue_theme">Blå</string>
-    <string name="settings_pink_theme">Rosa</string>
-    <string name="settings_catima_theme">Catima</string>
-    <string name="settings_theme_color">Draktfarge</string>
     <string name="noGroupCards">Denne gruppen er tom</string>
     <string name="barcodeImageDescriptionWithType">Bilde av <xliff:g>%s</xliff:g>-strekkode</string>
     <string name="sort_by">Sortering</string>

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

@@ -1,5 +1,4 @@
 <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>
@@ -46,208 +45,4 @@
         <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

@@ -144,15 +144,6 @@
     </plurals>
     <string name="settings_system_locale">Systeemtaal</string>
     <string name="settings_locale">Taal</string>
-    <string name="settings_brown_theme">Bruin</string>
-    <string name="settings_green_theme">Groen</string>
-    <string name="settings_sky_blue_theme">Hemelsblauw</string>
-    <string name="settings_blue_theme">Blauw</string>
-    <string name="settings_violet_theme">Violet</string>
-    <string name="settings_magenta_theme">Magenta</string>
-    <string name="settings_pink_theme">Roze</string>
-    <string name="settings_catima_theme">Catima</string>
-    <string name="settings_theme_color">Themakleur</string>
     <string name="app_contributors">Mede mogelijk gemaakt door: <xliff:g id="app_contributors">%s</xliff:g></string>
     <string name="noGroupCards">Deze groep bevat geen kaarten</string>
     <string name="barcodeImageDescriptionWithType">Afbeelding van barcode <xliff:g>%s</xliff:g></string>
@@ -305,4 +296,7 @@
     <string name="acra_crash_email_subject"><xliff:g id="app_name">%s</xliff:g> foutrapport</string>
     <string name="pref_enable_acra">Vraag om foutrapporten te versturen</string>
     <string name="pref_enable_acra_summary">Als dit aanstaat, zal je gevraagd worden om foutrapporten te sturen als de app crasht. Dit zal nooit automatisch gebeuren.</string>
+    <string name="nothing_to_copy">Geen waarde gevonden</string>
+    <string name="copied_to_clipboard">Gekopieerd naar klembord</string>
+    <string name="copy_value">Kopieer waarde</string>
 </resources>

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

@@ -58,7 +58,6 @@
     <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_theme_color">Color del tèma</string>
     <string name="settings_locale">Lenga</string>
     <string name="noGiftCardsGroup">Creatz de cartas puèi ligatz-las al grop aicí.</string>
 </resources>

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

@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+</resources>

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

@@ -67,15 +67,6 @@
     <string name="deleteTitle">Usuń kartę</string>
     <string name="deleteConfirmation">Usunąć tę kartę na stałe\?</string>
     <string name="app_contributors">Możliwe dzięki: <xliff:g id="app_contributors">%s</xliff:g></string>
-    <string name="settings_brown_theme">Brązowy</string>
-    <string name="settings_green_theme">Zielony</string>
-    <string name="settings_sky_blue_theme">Błękitny</string>
-    <string name="settings_blue_theme">Niebieski</string>
-    <string name="settings_violet_theme">Fioletowy</string>
-    <string name="settings_magenta_theme">Magenta</string>
-    <string name="settings_pink_theme">Różowy</string>
-    <string name="settings_catima_theme">Catima</string>
-    <string name="settings_theme_color">Kolor akcentowy motywu</string>
     <string name="settings_system_locale">System</string>
     <string name="settings_locale">Język</string>
     <string name="turn_flashlight_off">Wyłącz latarkę</string>

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

@@ -124,12 +124,6 @@
     <string name="settings_oled_dark_summary">Reduz o uso da bateria em telas OLED</string>
     <string name="settings_system_locale">Sistema</string>
     <string name="settings_oled_dark">Preto puro como cor de fundo para o tema escuro</string>
-    <string name="settings_pink_theme">Rosa</string>
-    <string name="settings_magenta_theme">Magenta</string>
-    <string name="settings_blue_theme">Azul</string>
-    <string name="settings_sky_blue_theme">Azul celeste</string>
-    <string name="settings_green_theme">Verde</string>
-    <string name="settings_brown_theme">Marrom</string>
     <string name="app_contributors">Só foi possível graças a: <xliff:g id="app_contributors">%s</xliff:g></string>
     <string name="sort">Ordenar</string>
     <string name="showMoreInfo">Mostrar informações</string>
@@ -176,10 +170,7 @@
     <string name="receive">Receber</string>
     <string name="amountParsingFailed">Quantidade inválida</string>
     <string name="addFromPdfFile">Selecionar arquivo PDF</string>
-    <string name="settings_theme_color">Cor do tema</string>
-    <string name="settings_catima_theme">Catima</string>
     <string name="selectColor">Selecionar cor</string>
-    <string name="settings_violet_theme">Violeta</string>
     <string name="sort_by_name">Nome</string>
     <string name="sort_by_expiry">Expiração</string>
     <string name="credits">Créditos</string>

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

@@ -71,7 +71,6 @@
     <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="chooseImportType">Importar dados de</string>
     <string name="card">Cartão</string>
@@ -93,8 +92,6 @@
     <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_brown_theme">Castanho</string>
     <string name="updateBarcodeQuestionTitle">Atualizar o valor do código de barras\?</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>
@@ -143,12 +140,6 @@
     <string name="turn_flashlight_off">Desligar lanterna</string>
     <string name="settings_locale">Idioma</string>
     <string name="settings_system_locale">Sistema</string>
-    <string name="settings_theme_color">Cor do tema</string>
-    <string name="settings_catima_theme">Catima</string>
-    <string name="settings_pink_theme">Rosa</string>
-    <string name="settings_magenta_theme">Magenta</string>
-    <string name="settings_violet_theme">Violeta</string>
-    <string name="settings_blue_theme">Azul</string>
     <string name="app_contributors">Tornado possível por: <xliff:g id="app_contributors">%s</xliff:g></string>
     <string name="sort">Ordenar</string>
     <string name="sort_by_name">Nome</string>

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

@@ -189,15 +189,6 @@
     <string name="settings_system_locale">Sistema</string>
     <string name="selectColor">Selecionar cor</string>
     <string name="setIcon">Definir miniatura</string>
-    <string name="settings_theme_color">Cor do tema</string>
-    <string name="settings_catima_theme">Catima</string>
-    <string name="settings_pink_theme">Rosa</string>
-    <string name="settings_magenta_theme">Magenta</string>
-    <string name="settings_violet_theme">Violeta</string>
-    <string name="settings_blue_theme">Azul</string>
-    <string name="settings_sky_blue_theme">Azul celeste</string>
-    <string name="settings_green_theme">Verde</string>
-    <string name="settings_brown_theme">Marrom</string>
     <string name="app_contributors">Só foi possível graças a: <xliff:g id="app_contributors">%s</xliff:g></string>
     <string name="sort">Ordenar</string>
     <string name="showMoreInfo">Mostrar informações</string>

app/src/main/res/values-ro-rRO/strings.xml

@@ -140,10 +140,8 @@
     <string name="setBackImage">Setați imaginea din spate</string>
     <string name="permissionReadCardsDescription">citiți cardurile dumneavoastră Catima și toate detaliile lor, inclusiv notițele și imaginile</string>
     <string name="anyDate">Orice dată</string>
-    <string name="settings_green_theme">Verde</string>
     <string name="failedLaunchingPhotoPicker">Nu a putut fi găsită o aplicație galerie suportată</string>
     <string name="expiryStateSentenceExpired">Expirat: <xliff:g>%s</xliff:g></string>
-    <string name="settings_pink_theme">Roz</string>
     <string name="source_repository">Repozitor Sursă</string>
     <string name="groupsList">Grupuri: <xliff:g>%s</xliff:g></string>
     <string name="enter_card_id">Introduceți numărul de identificare sau textul de pe cardul dumneavoastră</string>
@@ -172,7 +170,6 @@
     <string name="report_error">Raportați o eroare</string>
     <string name="switchToBackImage">Comutați către imaginea din spate</string>
     <string name="reverse">...în ordine inversă</string>
-    <string name="settings_brown_theme">Maro</string>
     <string name="app_contributors">Făcut posibil de: <xliff:g id="app_contributors">%s</xliff:g></string>
     <string name="app_copyright_short">Drepturi de autor © Sylvia van Os și contribuitorii</string>
     <string name="settings_oled_dark">Fundal pur negru pentru tema întunecată</string>
@@ -180,7 +177,6 @@
     <string name="field_must_not_be_empty">Câmpul nu poate fi gol</string>
     <string name="switchToFrontImage">Comutați către imaginea frontală</string>
     <string name="validFromSentence">Valid de la data de: <xliff:g>%s</xliff:g></string>
-    <string name="settings_catima_theme">Catima</string>
     <string name="previousCard">Precedent</string>
     <string name="settings_allow_content_provider_read_summary">Aplicațiile vor trebui totuși să solicite permisiunea pentru a primi acces</string>
     <string name="license">Licență</string>
@@ -193,7 +189,6 @@
     </plurals>
     <string name="sameAsCardId">Acelașil cu identificatorul</string>
     <string name="options">Opțiuni</string>
-    <string name="settings_magenta_theme">Magenta</string>
     <string name="failedGeneratingShareURL">Nu s-a putut genera un URL partajabil. Vă rugăm să raportați aceasta eroare.</string>
     <string name="selectColor">Selectați o culoare</string>
     <string name="setBarcodeHeight">Setați înălțimea codului de bare</string>
@@ -202,13 +197,11 @@
     <string name="settings_system_locale">Sistem</string>
     <string name="updateBalance">Actualizați balanța</string>
     <string name="sort_by_most_recently_used">Cele mai recent utilizate</string>
-    <string name="settings_theme_color">Culoare temă</string>
     <string name="importVoucherVault">Importați din Voucher Vault</string>
     <string name="barcodeId">Valoarea codului de bare</string>
     <string name="settings_locale">Limbă</string>
     <string name="sort_by_name">Nume</string>
     <string name="setFrontImage">Setați imaginea din față</string>
-    <string name="settings_sky_blue_theme">Albastru ca cerul</string>
     <string name="cameraPermissionRequired">Pentru această acțiune este necesară permisiunea de acces la camera …</string>
     <string name="settings_allow_content_provider_read_title">Permiteți altor aplicații să acceseze datele mele</string>
     <string name="updateBarcodeQuestionText">Ați schimbat identificatorul. Doriți să actualizați și codul de bare pentru a utiliza aceeași valoare?</string>
@@ -231,12 +224,10 @@
     <string name="failedToRetrieveImageFile">Nu s-a putut recupera fișierul imaginii</string>
     <string name="donate">Donați</string>
     <string name="group_name_already_in_use">Acest nume de grup este deja utilizat</string>
-    <string name="settings_violet_theme">Mov</string>
     <string name="include_if_asking_support">Dacă doriți să cereți ajutor, includeți informațiile următoare:</string>
     <string name="show_archived_cards">Afișați cardurile arhivate</string>
     <string name="app_libraries">Listă de biblioteci libere de la terți: <xliff:g id="app_libraries_list">%s</xliff:g></string>
     <string name="updateBalanceTitle">Cât de mult ați cheltuit sau primit?</string>
-    <string name="settings_blue_theme">Albastru</string>
     <string name="app_resources">Listă de resurse gratuite de la terți: <xliff:g id="app_resources_list">%s</xliff:g></string>
     <string name="app_name">Catima</string>
     <string name="shortcutSelectCard">Selectați un card</string>

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

@@ -152,15 +152,6 @@
     </plurals>
     <string name="settings_system_locale">Системный</string>
     <string name="settings_locale">Язык</string>
-    <string name="settings_sky_blue_theme">Голубой</string>
-    <string name="settings_catima_theme">Catima</string>
-    <string name="settings_brown_theme">Коричневый</string>
-    <string name="settings_green_theme">Зелёный</string>
-    <string name="settings_blue_theme">Синий</string>
-    <string name="settings_violet_theme">Фиолетовый</string>
-    <string name="settings_magenta_theme">Пурпурный</string>
-    <string name="settings_pink_theme">Розовый</string>
-    <string name="settings_theme_color">Цвет темы</string>
     <string name="app_contributors">Создано при поддержке: <xliff:g id="app_contributors">%s</xliff:g></string>
     <string name="noGroupCards">Группа пуста</string>
     <string name="barcodeImageDescriptionWithType">Изображение штрих-кода <xliff:g>%s</xliff:g></string>

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

@@ -114,7 +114,6 @@
     <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">Knižnice tretích strán: <xliff:g id="app_libraries_list">%s</xliff:g></string>
     <string name="app_resources">Zdroje tretích strán: <xliff:g id="app_resources_list">%s</xliff:g></string>
     <string name="importCatimaMessage">Vyberte svoj 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>
@@ -137,14 +136,6 @@
     <string name="yes">Áno</string>
     <string name="selectColor">Vybrať farbu</string>
     <string name="setIcon">Nastavenie miniatúry</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_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>

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

@@ -80,14 +80,6 @@
     <string name="exportPassword">Izberi geslo za zaščito izvoza (neobvezno)</string>
     <string name="help_translate_this_app">Pomagaj pri prevajanju aplikacije</string>
     <string name="version_history">Zgodovina različic</string>
-    <string name="settings_brown_theme">Rjava</string>
-    <string name="settings_green_theme">Zelena</string>
-    <string name="settings_sky_blue_theme">Sinje modra</string>
-    <string name="settings_blue_theme">Modra</string>
-    <string name="settings_violet_theme">Vijolična</string>
-    <string name="settings_magenta_theme">Magenta</string>
-    <string name="settings_pink_theme">Roza</string>
-    <string name="settings_theme_color">Barva teme</string>
     <string name="settings_system_locale">Sistem</string>
     <string name="settings_locale">Jezik</string>
     <string name="barcodeImageDescriptionWithType">Slika <xliff:g>%s</xliff:g> črtna koda</string>
@@ -218,7 +210,6 @@
     <string name="failedGeneratingShareURL">URL-ja za skupno rabo ni bilo mogoče ustvariti</string>
     <string name="settings_oled_dark">Čisto črno ozadje za temno temo</string>
     <string name="selectColor">Izberi barvo</string>
-    <string name="settings_catima_theme">Catima</string>
     <string name="app_contributors">Omogočeno od: <xliff:g id="app_contributors">%s</xliff:g></string>
     <string name="barcodeLongPressMessage">V aplikaciji za gledanje slik lahko odpremo samo slike</string>
     <plurals name="groupCardCountWithArchived">

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

@@ -128,12 +128,6 @@
     <string name="settings_system_locale">Sistem</string>
     <string name="selectColor">Odaberi boju</string>
     <string name="setIcon">Odaberi naslovnu fotografiju</string>
-    <string name="settings_theme_color">Boja teme</string>
-    <string name="settings_catima_theme">Catima</string>
-    <string name="settings_pink_theme">Roze</string>
-    <string name="settings_magenta_theme">Magenta</string>
-    <string name="settings_violet_theme">Ljubičasta</string>
-    <string name="settings_brown_theme">Braon</string>
     <string name="sort">Sortiranje</string>
     <string name="showMoreInfo">Prikaži informacije</string>
     <string name="updateBalance">Ažuriraj stanje</string>
@@ -249,10 +243,7 @@
     <string name="updateBarcodeQuestionText">Promenio si broj kartice. Da li želiš da ažuriraš i bar-kod da bude iste vrednosti?</string>
     <string name="no">Ne</string>
     <string name="app_contributors">Saradnici: <xliff:g id="app_contributors">%s</xliff:g></string>
-    <string name="settings_sky_blue_theme">Nebo plava</string>
-    <string name="settings_green_theme">Zelena</string>
     <string name="barcodeLongPressMessage">Samo fotografije mogu da se otvore u galerija aplikaciji</string>
-    <string name="settings_blue_theme">Plava</string>
     <string name="translate_platform">na Weblate-u</string>
     <plurals name="groupCardCountWithArchived">
         <item quantity="one"><xliff:g>%1$d</xliff:g> kartica (<xliff:g id="archivedCount">%2$d</xliff:g> arhivirana)</item>

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

@@ -144,15 +144,6 @@
     <string name="settings_system_locale">System</string>
     <string name="settings_locale">Språk</string>
     <string name="app_contributors">Möjliggjordes av: <xliff:g id="app_contributors">%s</xliff:g></string>
-    <string name="settings_brown_theme">Brunt</string>
-    <string name="settings_green_theme">Grönt</string>
-    <string name="settings_sky_blue_theme">Himmelblått</string>
-    <string name="settings_blue_theme">Blått</string>
-    <string name="settings_violet_theme">Violett</string>
-    <string name="settings_magenta_theme">Magenta</string>
-    <string name="settings_pink_theme">Rosa</string>
-    <string name="settings_catima_theme">Catima</string>
-    <string name="settings_theme_color">Temafärg</string>
     <string name="noGroupCards">Denna grupp är tom</string>
     <string name="barcodeImageDescriptionWithType">Bild <xliff:g>%s</xliff:g> streckkod</string>
     <string name="reverse">...i omvänd ordning</string>

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

@@ -70,8 +70,6 @@
     <string name="settings_system_locale">மண்டலம்</string>
     <string name="selectColor">வண்ணத்தைத் தேர்ந்தெடுக்கவும்</string>
     <string name="setIcon">சிறு உருவத்தை அமைக்கவும்</string>
-    <string name="settings_blue_theme">நீலம்</string>
-    <string name="settings_green_theme">பச்சை</string>
     <string name="sort">வரிசைப்படுத்து</string>
     <string name="showMoreInfo">தகவலைக் காட்டு</string>
     <string name="nextCard">அடுத்தது</string>
@@ -161,17 +159,10 @@
     <string name="turn_flashlight_off">ஒளிரும் விளக்கை அணைக்கவும்</string>
     <string name="settings_locale">மொழி</string>
     <string name="settings_oled_dark">இருண்ட கருப்பொருளுக்கு தூய கருப்பு பின்னணி</string>
-    <string name="settings_theme_color">கருப்பொருள் நிறம்</string>
-    <string name="settings_catima_theme">கேட்டிமா</string>
-    <string name="settings_pink_theme">இளஞ்சிவப்பு</string>
-    <string name="settings_magenta_theme">மெசந்தா</string>
-    <string name="settings_violet_theme">கத்தரி</string>
-    <string name="settings_sky_blue_theme">வானம் நீலம்</string>
     <string name="sort_by_name">பெயர்</string>
     <string name="sort_by_most_recently_used">மிக அண்மைக் காலத்தில் பயன்படுத்தப்பட்டது</string>
     <string name="sort_by_expiry">காலாவதியாகும்</string>
     <string name="reverse">… தலைகீழ் வரிசையில்</string>
-    <string name="settings_brown_theme">பழுப்பு</string>
     <string name="updateBalance">இருப்பு புதுப்பிக்கவும்</string>
     <string name="failedToRetrieveImageFile">படக் கோப்பை மீட்டெடுப்பதில் தோல்வி</string>
     <string name="sort_by">வரிசைப்படுத்தவும்</string>

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

@@ -1,15 +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_contributors">Katkıda bulunanlar: <xliff:g id="app_contributors">%s</xliff:g></string>
-    <string name="settings_brown_theme">Kahverengi</string>
-    <string name="settings_green_theme">Yeşil</string>
-    <string name="settings_sky_blue_theme">Gök mavisi</string>
-    <string name="settings_blue_theme">Mavi</string>
-    <string name="settings_violet_theme">Mor</string>
-    <string name="settings_magenta_theme">Eflatun</string>
-    <string name="settings_pink_theme">Pembe</string>
-    <string name="settings_catima_theme">Catima</string>
-    <string name="settings_theme_color">Tema rengi</string>
     <string name="settings_system_locale">Sistem</string>
     <string name="settings_locale">Dil</string>
     <string name="turn_flashlight_off">El fenerini kapat</string>
@@ -305,4 +296,7 @@
     <string name="acra_crash_email_subject"><xliff:g id="app_name">%s</xliff:g> çökme raporu</string>
     <string name="pref_enable_acra_summary">Etkinleştirildiğinde, bir çökmeyi şikayet etmeniz istenecektir. Çökme raporları hiç bir zaman otomatik olarak gönderilmez.</string>
     <string name="pref_enable_acra">Çökme bildirimlerini göndermeyi iste</string>
+    <string name="copy_value">Değeri kopyala</string>
+    <string name="copied_to_clipboard">Panoya kopyalandı</string>
+    <string name="nothing_to_copy">Değer bulunamadı</string>
 </resources>

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

@@ -150,17 +150,8 @@
         <item quantity="many">Видалити ці <xliff:g>%d</xliff:g> карток назавжди\?</item>
         <item quantity="other">Видалити ці <xliff:g>%d</xliff:g> карток назавжди\?</item>
     </plurals>
-    <string name="settings_blue_theme">Синій</string>
-    <string name="settings_violet_theme">Фіолетовий</string>
-    <string name="settings_magenta_theme">Пурпуровий</string>
-    <string name="settings_pink_theme">Рожевий</string>
-    <string name="settings_catima_theme">Catima</string>
-    <string name="settings_theme_color">Колір теми</string>
     <string name="settings_system_locale">Системна</string>
     <string name="settings_locale">Мова</string>
-    <string name="settings_brown_theme">Коричневий</string>
-    <string name="settings_green_theme">Зелений</string>
-    <string name="settings_sky_blue_theme">Небесно-синій</string>
     <string name="app_contributors">Стало можливим завдяки: <xliff:g id="app_contributors">%s</xliff:g></string>
     <string name="noGroupCards">Пуста група</string>
     <string name="barcodeImageDescriptionWithType">Зображення штрих-коду <xliff:g>%s</xliff:g></string>

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

@@ -72,10 +72,8 @@
     <string name="permissionReadCardsDescription">đọc thẻ Catima của bạn và mọi thông tin trong đó, bao gồm cả ghi chú và ảnh</string>
     <string name="anyDate">Bất cứ ngày nào</string>
     <string name="unsupportedBarcodeType">Loại mã vạch này chưa thể hiện thị được. Ửng dụng có thể hỗ trợ nó ở những phiên bản sau này.</string>
-    <string name="settings_green_theme">Màu xanh lá</string>
     <string name="failedLaunchingPhotoPicker">Không tìm thấy ứng dụng thư viện ảnh được hỗ trợ</string>
     <string name="expiryStateSentenceExpired">Quá hạn: <xliff:g>%s</xliff:g></string>
-    <string name="settings_pink_theme">Màu hồng</string>
     <string name="groupsList">Nhóm: <xliff:g>%s</xliff:g></string>
     <string name="yes">Có</string>
     <string name="barcodeType">Loại mã vạch</string>
@@ -114,7 +112,6 @@
     <string name="star">Đánh dấu ưa thích</string>
     <string name="addFromImage">Chọn ảnh từ thư viện ảnh</string>
     <string name="reverse">...theo trật tự đảo ngược</string>
-    <string name="settings_brown_theme">Màu nâu</string>
     <string name="app_copyright_short">Bản quyền © Sylvia van Os và các cộng sự</string>
     <string name="importExportHelp">Sao lưu cho phép bạn chuyển dữ liệu của mình đến thiết bị khác.</string>
     <string name="settings_oled_dark">Nền đen tuyền cho chủ đề tối</string>
@@ -123,7 +120,6 @@
     <string name="importOptionFilesystemExplanation">Chọn 1 tập tin cụ thể từ hệ thống (filesystem).</string>
     <string name="validFromSentence">Hợp lệ từ: <xliff:g>%s</xliff:g></string>
     <string name="exportSuccessful">Xuất dữ liệu xong</string>
-    <string name="settings_catima_theme">Catima</string>
     <string name="previousCard">Trước</string>
     <string name="settings_allow_content_provider_read_summary">Mọi ứng dụng vẫn phải cần phải xin cấp phép để được truy cập</string>
     <string name="license">Giấy phép</string>
@@ -141,7 +137,6 @@
     <string name="options">Tùy chọn</string>
     <string name="sendLabel">Gửi…</string>
     <string name="importOptionFilesystemButton">Lấy từ hệ thống</string>
-    <string name="settings_magenta_theme">Màu sắc tố tím và đỏ</string>
     <string name="failedGeneratingShareURL">Không tạo được URL chia sẻ. Xin hãy báo cáo sự cố này.</string>
     <string name="selectColor">Chọn màu</string>
     <string name="setBarcodeHeight">Đặt chiều cao cho mã vạch</string>
@@ -156,7 +151,6 @@
     <string name="app_copyright_fmt" tools:ignore="PluralsCandidate">Bản quyền © 2019–<xliff:g>%d</xliff:g> Sylvia van Os và các cộng sự</string>
     <string name="sort_by_most_recently_used">Sửa dụng gần đây nhất</string>
     <string name="noGiftCards">Bấm nút dấu cộng + để thêm thẻ, hoặc nhập dữ liệu từ ⋮ menu</string>
-    <string name="settings_theme_color">Chủ đề màu</string>
     <string name="importVoucherVault">Nhập dữ liệu từ Voucher Vault</string>
     <string name="barcodeId">Giá trị mã vạch</string>
     <string name="settings_locale">Ngôn ngữ</string>
@@ -166,7 +160,6 @@
     <string name="errorReadingImage">Không thể xem được ảnh</string>
     <string name="setFrontImage">Đặt ảnh mặt trước</string>
     <string name="settings_theme">Chủ đề</string>
-    <string name="settings_sky_blue_theme">Xanh da trời</string>
     <string name="balance">Số dư</string>
     <string name="cameraPermissionRequired">Tác vụ này cần được cấp quyền sử dụng camera…</string>
     <string name="settings_allow_content_provider_read_title">Cho phép ứng dụng khác truy cập vào dữ liệu của tôi</string>
@@ -202,7 +195,6 @@
     <string name="group_name_already_in_use">Tên nhóm đã tạo rồi</string>
     <string name="exportFailedTitle">Xuất dữ liệu thất bại</string>
     <string name="leaveWithoutSaveConfirmation">Bỏ không lưu chứ\?</string>
-    <string name="settings_violet_theme">Màu tím</string>
     <string name="card">Thẻ</string>
     <string name="never">Không bao giờ</string>
     <string name="include_if_asking_support">Nếu bạn muốn yêu cầu hỗ trợ, hãy cung cấp những thông tin sau:</string>
@@ -214,7 +206,6 @@
     <string name="updateBalanceTitle">Bạn đã chi tiêu hoặc nhận được bao nhiêu?</string>
     <string name="editCardTitle">Sửa Thẻ</string>
     <string name="archive">Lưu trữ</string>
-    <string name="settings_blue_theme">Màu xanh dương</string>
     <string name="app_resources">Tài nguyên mở từ bên thứ 3: <xliff:g id="app_resources_list">%s</xliff:g></string>
     <string name="shortcutSelectCard">Chọn một thẻ</string>
     <string name="accept">Đồng ý</string>

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

@@ -147,10 +147,8 @@
     </plurals>
     <string name="settings_locale">语言</string>
     <string name="setIcon">设置缩略图</string>
-    <string name="settings_pink_theme">粉色</string>
     <string name="settings_oled_dark">纯黑色背景的深色主题</string>
     <string name="translate_platform">在Weblate上</string>
-    <string name="settings_sky_blue_theme">天蓝</string>
     <string name="showMoreInfo">显示信息</string>
     <string name="options">选项</string>
     <string name="source_repository">源码库</string>
@@ -164,26 +162,19 @@
     <string name="shortcutSelectCard">选择一张卡片</string>
     <string name="group_name_already_in_use">组名已在使用中</string>
     <string name="group_name_is_empty">组名不可为空</string>
-    <string name="settings_brown_theme">棕色</string>
-    <string name="settings_green_theme">绿色</string>
     <string name="sort_by_most_recently_used">最近使用</string>
     <string name="sort_by_name">名称</string>
     <string name="help_translate_this_app">帮助翻译此应用</string>
     <string name="reverse">倒序</string>
     <string name="sort_by">排序方式</string>
     <string name="selectColor">选择颜色</string>
-    <string name="settings_theme_color">主题色</string>
-    <string name="settings_blue_theme">蓝色</string>
     <string name="sort_by_expiry">到期日</string>
-    <string name="settings_catima_theme">Catima</string>
     <string name="noGroupCards">该组是空的</string>
     <string name="on_github">在GitHub上</string>
     <string name="group_updated">群组已更新</string>
     <string name="editGroup">编辑组：<xliff:g>%s</xliff:g></string>
     <string name="settings_system_locale">系统</string>
     <string name="exportPassword">设置密码来保护导出的内容（可选）</string>
-    <string name="settings_magenta_theme">紫红</string>
-    <string name="settings_violet_theme">紫色</string>
     <string name="app_contributors">因他们而存在: <xliff:g id="app_contributors">%s</xliff:g></string>
     <string name="and_data_usage">和数据使用方法</string>
     <string name="failedLaunchingPhotoPicker">找不到支持的图片选择应用</string>

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

@@ -77,14 +77,6 @@
     <string name="noCardExistsError">無法找到此卡片</string>
     <string name="noCardsMessage">請先新增卡片</string>
     <string name="sort">排列</string>
-    <string name="settings_catima_theme">卡提碼</string>
-    <string name="settings_pink_theme">粉紅</string>
-    <string name="settings_magenta_theme">品紅</string>
-    <string name="settings_violet_theme">紫色</string>
-    <string name="settings_blue_theme">藍色</string>
-    <string name="settings_sky_blue_theme">天空藍</string>
-    <string name="settings_green_theme">綠色</string>
-    <string name="settings_brown_theme">棕色</string>
     <string name="sort_by_name">名稱</string>
     <string name="sort_by_most_recently_used">最近使用</string>
     <string name="sort_by_expiry">逾期日期</string>
@@ -111,7 +103,6 @@
     <string name="turn_flashlight_off">關閉手電筒</string>
     <string name="settings_locale">語言</string>
     <string name="settings_system_locale">系統語言</string>
-    <string name="settings_theme_color">主題顏色</string>
     <string name="app_contributors">感謝以下貢獻者：<xliff:g id="app_contributors">%s</xliff:g></string>
     <string name="privacy_policy">隱私權政策</string>
     <plurals name="selectedCardCount">

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

@@ -12,30 +12,6 @@
         <item>@string/settings_dark_theme</item>
     </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>
-        <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">
-        <item>@string/settings_system_theme</item>
-        <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="column_count_portrait_values">
         <item>@string/settings_key_automatic_column_count</item>
         <item>1</item>
@@ -70,28 +46,6 @@
         <item>@string/settings_column_count_7</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>
-
     <!--
       NB: this list needs to be updated manually for new/removed languages and
       is used to generate the locale lists in app/build.gradle and
@@ -144,6 +98,7 @@
         <item>nb-rNO</item>
         <item>nl</item>
         <item>oc</item>
+        <!-- <item>peo</item> -->
         <item>pl</item>
         <item>pt</item>
         <item>pt-rBR</item>

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

@@ -211,24 +211,6 @@
     <string name="settings_system_locale">System</string>
     <string name="selectColor">Select color</string>
     <string name="setIcon">Set thumbnail</string>
-    <string name="setting_key_theme_color" translatable="false">pref_theme_color</string>
-    <string name="settings_theme_color">Theme color</string>
-    <string name="settings_catima_theme">Catima</string>
-    <string name="settings_pink_theme">Pink</string>
-    <string name="settings_magenta_theme">Magenta</string>
-    <string name="settings_violet_theme">Violet</string>
-    <string name="settings_blue_theme">Blue</string>
-    <string name="settings_sky_blue_theme">Sky blue</string>
-    <string name="settings_green_theme">Green</string>
-    <string name="settings_brown_theme">Brown</string>
-    <string name="settings_key_catima_theme" translatable="false">catima_theme</string>
-    <string name="settings_key_pink_theme" translatable="false">pink_theme</string>
-    <string name="settings_key_magenta_theme" translatable="false">magenta_theme</string>
-    <string name="settings_key_violet_theme" translatable="false">violet_theme</string>
-    <string name="settings_key_blue_theme" translatable="false">blue_theme</string>
-    <string name="settings_key_sky_blue_theme" translatable="false">sky_blue_theme</string>
-    <string name="settings_key_green_theme" translatable="false">green_theme</string>
-    <string name="settings_key_brown_theme" translatable="false">brown_theme</string>
     <string name="app_contributors">Made possible by: <xliff:g id="app_contributors">%s</xliff:g></string>
     <string name="sort">Sort</string>
     <string name="showMoreInfo">Show info</string>
@@ -361,4 +343,7 @@
     <string name="copy_value">Copy value</string>
     <string name="copied_to_clipboard">Copied to clipboard</string>
     <string name="nothing_to_copy">No value found</string>
+    <string name="barcodeEncoding">Barcode encoding</string>
+    <string name="automatic">Automatic</string>
+    <string name="back">Back</string>
 </resources>

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

@@ -1,5 +1,4 @@
 <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>
@@ -60,208 +59,4 @@
 
     <!-- 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

@@ -16,16 +16,6 @@
             app:singleLineTitle="false"
             app:useSimpleSummaryProvider="true" />
 
-        <ListPreference
-            android:key="@string/setting_key_theme_color"
-            android:title="@string/settings_theme_color"
-            android:defaultValue="@string/settings_key_system_theme"
-            android:entries="@array/color_value_strings"
-            android:entryValues="@array/color_values"
-            app:iconSpaceReserved="false"
-            app:singleLineTitle="false"
-            app:useSimpleSummaryProvider="true" />
-
         <SwitchPreferenceCompat
             android:widgetLayout="@layout/preference_material_switch"
             android:defaultValue="false"

app/src/test/java/protect/card_locker/AboutActivityTest.kt

@@ -1,171 +0,0 @@
-package protect.card_locker
-
-import android.content.Intent
-import android.net.Uri
-import android.view.View
-import android.widget.TextView
-import androidx.core.view.isVisible
-import org.junit.Assert.assertEquals
-import org.junit.Assert.assertFalse
-import org.junit.Assert.assertNotNull
-import org.junit.Assert.assertTrue
-import org.junit.Assert.fail
-import org.junit.Before
-import org.junit.Test
-import org.junit.runner.RunWith
-import org.robolectric.Robolectric
-import org.robolectric.RobolectricTestRunner
-import org.robolectric.Shadows.shadowOf
-import org.robolectric.shadows.ShadowActivity
-import org.robolectric.shadows.ShadowLog
-import java.lang.reflect.Method
-
-@RunWith(RobolectricTestRunner::class)
-class AboutActivityTest {
-    private lateinit var activityController: org.robolectric.android.controller.ActivityController<AboutActivity>
-    private lateinit var activity: AboutActivity
-    private lateinit var shadowActivity: ShadowActivity
-
-    @Before
-    fun setUp() {
-        ShadowLog.stream = System.out
-        activityController = Robolectric.buildActivity(AboutActivity::class.java)
-        activity = activityController.get()
-        shadowActivity = shadowOf(activity)
-    }
-
-    @Test
-    fun testActivityCreation() {
-        activityController.create().start().resume()
-
-        // Verify activity title is set correctly
-        assertEquals(activity.title.toString(),
-            activity.getString(R.string.about_title_fmt, activity.getString(R.string.app_name)))
-
-        // Check key elements are initialized
-        assertNotNull(activity.findViewById(R.id.toolbar))
-        assertNotNull(activity.findViewById(R.id.credits_sub))
-        assertNotNull(activity.findViewById(R.id.version_history_sub))
-    }
-
-    @Test
-    fun testDisplayOptionsBasedOnConfig() {
-        activityController.create().start().resume()
-
-        // Test Google Play rate button visibility based on BuildConfig
-        val rateButton = activity.findViewById<View>(R.id.rate)
-        assertEquals(BuildConfig.showRateOnGooglePlay, rateButton.isVisible)
-
-        // Test donate button visibility based on BuildConfig
-        val donateButton = activity.findViewById<View>(R.id.donate)
-        assertEquals(BuildConfig.showDonate, donateButton.isVisible)
-    }
-
-    @Test
-    fun testClickListeners() {
-        activityController.create().start().resume()
-
-        // Test clicking on a link that opens external browser
-        val repoButton = activity.findViewById<View>(R.id.repo)
-        repoButton.performClick()
-
-        val startedIntent = shadowActivity.nextStartedActivity
-        assertEquals(Intent.ACTION_VIEW, startedIntent.action)
-        assertEquals(Uri.parse("https://github.com/CatimaLoyalty/Android/"),
-            startedIntent.data)
-    }
-
-    @Test
-    fun testActivityDestruction() {
-        activityController.create().start().resume()
-
-        // Verify a view exists before destruction
-        assertNotNull(activity.findViewById(R.id.credits_sub))
-
-        activityController.pause().stop().destroy()
-
-        // Verify activity was destroyed
-        assertTrue(activity.isDestroyed)
-    }
-
-    @Test
-    fun testDialogContentMethods() {
-        activityController.create().start().resume()
-
-        // Use reflection to test private methods
-        try {
-            val showCreditsMethod: Method = AboutActivity::class.java.getDeclaredMethod("showCredits")
-            showCreditsMethod.isAccessible = true
-            showCreditsMethod.invoke(activity) // Should not throw exception
-
-            val showHistoryMethod: Method = AboutActivity::class.java.getDeclaredMethod("showHistory", View::class.java)
-            showHistoryMethod.isAccessible = true
-            showHistoryMethod.invoke(activity, activity.findViewById(R.id.version_history)) // Should not throw exception
-        } catch (e: Exception) {
-            fail("Exception when calling dialog methods: ${e.message}")
-        }
-    }
-
-    @Test
-    fun testExternalBrowserWithDifferentURLs() {
-        activityController.create().start().resume()
-
-        try {
-            // Get access to the private method
-            val openExternalBrowserMethod: Method = AboutActivity::class.java.getDeclaredMethod("openExternalBrowser", View::class.java)
-            openExternalBrowserMethod.isAccessible = true
-
-            // Create test URLs
-            val testUrls = arrayOf(
-                "https://hosted.weblate.org/engage/catima/",
-                "https://github.com/CatimaLoyalty/Android/blob/main/LICENSE",
-                "https://catima.app/privacy-policy/",
-                "https://github.com/CatimaLoyalty/Android/issues"
-            )
-
-            for (url in testUrls) {
-                // Create a View with the URL as tag
-                val testView = View(activity)
-                testView.tag = url
-
-                // Call the method directly
-                openExternalBrowserMethod.invoke(activity, testView)
-
-                // Verify the intent
-                val intent = shadowActivity.nextStartedActivity
-                assertNotNull("No intent launched for URL: $url", intent)
-                assertEquals(Intent.ACTION_VIEW, intent.action)
-                assertEquals(Uri.parse(url), intent.data)
-            }
-        } catch (e: Exception) {
-            fail("Exception during reflection: ${e.message}")
-        }
-    }
-
-    @Test
-    fun testButtonVisibilityBasedOnBuildConfig() {
-        activityController.create().start().resume()
-
-        // Get the current values from BuildConfig
-        val showRateOnGooglePlay = BuildConfig.showRateOnGooglePlay
-        val showDonate = BuildConfig.showDonate
-
-        // Test that the visibility matches the BuildConfig values
-        assertEquals(showRateOnGooglePlay, activity.findViewById<View>(R.id.rate).isVisible)
-        assertEquals(showDonate, activity.findViewById<View>(R.id.donate).isVisible)
-    }
-
-    @Test
-    fun testAboutScreenTextContent() {
-        activityController.create().start().resume()
-
-        // Verify that text fields contain the expected content
-        val creditsSub = activity.findViewById<TextView>(R.id.credits_sub)
-        assertNotNull(creditsSub.text)
-        assertFalse(creditsSub.text.toString().isEmpty())
-
-        val versionHistorySub = activity.findViewById<TextView>(R.id.version_history_sub)
-        assertNotNull(versionHistorySub.text)
-        assertFalse(versionHistorySub.text.toString().isEmpty())
-    }
-}

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

@@ -21,6 +21,7 @@ import org.robolectric.Robolectric;
 import org.robolectric.RobolectricTestRunner;
 
 import java.math.BigDecimal;
+import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.Currency;
 import java.util.List;
@@ -41,7 +42,7 @@ public class DatabaseTest {
     @Test
     public void addRemoveOneGiftCard() {
         assertEquals(0, DBHelper.getLoyaltyCardCount(mDatabase));
-        long id = DBHelper.insertLoyaltyCard(mDatabase, "store", "note", null, null, new BigDecimal("0"), null, "cardId", null, CatimaBarcode.fromBarcode(BarcodeFormat.UPC_A), DEFAULT_HEADER_COLOR, 0, null,0);
+        long id = DBHelper.insertLoyaltyCard(mDatabase, "store", "note", null, null, new BigDecimal("0"), null, "cardId", null, CatimaBarcode.fromBarcode(BarcodeFormat.UPC_A), null, DEFAULT_HEADER_COLOR, 0, null,0);
         boolean result = (id != -1);
         assertTrue(result);
         assertEquals(1, DBHelper.getLoyaltyCardCount(mDatabase));
@@ -57,6 +58,7 @@ public class DatabaseTest {
         assertEquals("cardId", loyaltyCard.cardId);
         assertEquals(null, loyaltyCard.barcodeId);
         assertEquals(BarcodeFormat.UPC_A, loyaltyCard.barcodeType.format());
+        assertEquals(null, loyaltyCard.barcodeEncoding);
         assertEquals(DEFAULT_HEADER_COLOR, loyaltyCard.headerColor);
         assertEquals(0, loyaltyCard.starStatus);
         assertEquals(0, loyaltyCard.archiveStatus);
@@ -69,12 +71,12 @@ public class DatabaseTest {
 
     @Test
     public void updateGiftCard() {
-        long id = DBHelper.insertLoyaltyCard(mDatabase, "store", "note", null, null, new BigDecimal("0"), null, "cardId", null, CatimaBarcode.fromBarcode(BarcodeFormat.UPC_A), DEFAULT_HEADER_COLOR, 0, null,0);
+        long id = DBHelper.insertLoyaltyCard(mDatabase, "store", "note", null, null, new BigDecimal("0"), null, "cardId", null, CatimaBarcode.fromBarcode(BarcodeFormat.UPC_A), null, DEFAULT_HEADER_COLOR, 0, null,0);
         boolean result = (id != -1);
         assertTrue(result);
         assertEquals(1, DBHelper.getLoyaltyCardCount(mDatabase));
 
-        result = DBHelper.updateLoyaltyCard(mDatabase, 1, "store1", "note1", null, null, new BigDecimal("10.00"), Currency.getInstance("EUR"), "cardId1", null, CatimaBarcode.fromBarcode(BarcodeFormat.AZTEC), DEFAULT_HEADER_COLOR, 0, null, 0);
+        result = DBHelper.updateLoyaltyCard(mDatabase, 1, "store1", "note1", null, null, new BigDecimal("10.00"), Currency.getInstance("EUR"), "cardId1", null, CatimaBarcode.fromBarcode(BarcodeFormat.AZTEC), StandardCharsets.UTF_8, DEFAULT_HEADER_COLOR, 0, null, 0);
         assertTrue(result);
         assertEquals(1, DBHelper.getLoyaltyCardCount(mDatabase));
 
@@ -89,6 +91,7 @@ public class DatabaseTest {
         assertEquals("cardId1", loyaltyCard.cardId);
         assertEquals(null, loyaltyCard.barcodeId);
         assertEquals(BarcodeFormat.AZTEC, loyaltyCard.barcodeType.format());
+        assertEquals(StandardCharsets.UTF_8, loyaltyCard.barcodeEncoding);
         assertEquals(DEFAULT_HEADER_COLOR, loyaltyCard.headerColor);
         assertEquals(0, loyaltyCard.starStatus);
         assertEquals(0, loyaltyCard.archiveStatus);
@@ -96,7 +99,7 @@ public class DatabaseTest {
 
     @Test
     public void updateGiftCardOnlyStar() {
-        long id = DBHelper.insertLoyaltyCard(mDatabase, "store", "note", null, null, new BigDecimal("0"), null, "cardId", null, CatimaBarcode.fromBarcode(BarcodeFormat.UPC_A), DEFAULT_HEADER_COLOR, 0, null,0);
+        long id = DBHelper.insertLoyaltyCard(mDatabase, "store", "note", null, null, new BigDecimal("0"), null, "cardId", null, CatimaBarcode.fromBarcode(BarcodeFormat.UPC_A), null, DEFAULT_HEADER_COLOR, 0, null,0);
         boolean result = (id != -1);
         assertTrue(result);
         assertEquals(1, DBHelper.getLoyaltyCardCount(mDatabase));
@@ -116,6 +119,7 @@ public class DatabaseTest {
         assertEquals("cardId", loyaltyCard.cardId);
         assertEquals(null, loyaltyCard.barcodeId);
         assertEquals(BarcodeFormat.UPC_A, loyaltyCard.barcodeType.format());
+        assertEquals(null, loyaltyCard.barcodeEncoding);
         assertEquals(DEFAULT_HEADER_COLOR, loyaltyCard.headerColor);
         assertEquals(1, loyaltyCard.starStatus);
         assertEquals(0, loyaltyCard.archiveStatus);
@@ -126,14 +130,14 @@ public class DatabaseTest {
         assertEquals(0, DBHelper.getLoyaltyCardCount(mDatabase));
 
         boolean result = DBHelper.updateLoyaltyCard(mDatabase, 1, "store1", "note1", null, null, new BigDecimal("0"), null, "cardId1",
-                null, CatimaBarcode.fromBarcode(BarcodeFormat.UPC_A), DEFAULT_HEADER_COLOR, 0, null, 0);
+                null, CatimaBarcode.fromBarcode(BarcodeFormat.UPC_A), null, DEFAULT_HEADER_COLOR, 0, null, 0);
         assertEquals(false, result);
         assertEquals(0, DBHelper.getLoyaltyCardCount(mDatabase));
     }
 
     @Test
     public void emptyGiftCardValues() {
-        long id = DBHelper.insertLoyaltyCard(mDatabase, "", "", null, null, new BigDecimal("0"), null, "", null, null, null, 0, null,0);
+        long id = DBHelper.insertLoyaltyCard(mDatabase, "", "", null, null, new BigDecimal("0"), null, "", null, null, null, null, 0, null,0);
         boolean result = (id != -1);
         assertTrue(result);
         assertEquals(1, DBHelper.getLoyaltyCardCount(mDatabase));
@@ -149,6 +153,7 @@ public class DatabaseTest {
         assertEquals("", loyaltyCard.cardId);
         assertEquals(null, loyaltyCard.barcodeId);
         assertEquals(null, loyaltyCard.barcodeType);
+        assertEquals(null, loyaltyCard.barcodeEncoding);
         // headerColor is randomly generated when not given, so skip
         assertEquals(0, loyaltyCard.starStatus);
         assertEquals(0, loyaltyCard.archiveStatus);
@@ -162,7 +167,7 @@ public class DatabaseTest {
         // that they are sorted
         for (int index = CARDS_TO_ADD - 1; index >= 0; index--) {
             long id = DBHelper.insertLoyaltyCard(mDatabase, "store" + index, "note" + index, null, null, new BigDecimal("0"), null, "cardId" + index,
-                    null, CatimaBarcode.fromBarcode(BarcodeFormat.UPC_A), index, 0, null,0);
+                    null, CatimaBarcode.fromBarcode(BarcodeFormat.UPC_A), StandardCharsets.UTF_8, index, 0, null,0);
             boolean result = (id != -1);
             assertTrue(result);
         }
@@ -186,6 +191,7 @@ public class DatabaseTest {
             assertEquals("cardId" + index, cursor.getString(cursor.getColumnIndexOrThrow(DBHelper.LoyaltyCardDbIds.CARD_ID)));
             assertEquals(null, cursor.getString(cursor.getColumnIndexOrThrow(DBHelper.LoyaltyCardDbIds.BARCODE_ID)));
             assertEquals(BarcodeFormat.UPC_A.toString(), cursor.getString(cursor.getColumnIndexOrThrow(DBHelper.LoyaltyCardDbIds.BARCODE_TYPE)));
+            assertEquals(StandardCharsets.UTF_8.name(), cursor.getString(cursor.getColumnIndexOrThrow(DBHelper.LoyaltyCardDbIds.BARCODE_ENCODING)));
             assertEquals(index, cursor.getInt(cursor.getColumnIndexOrThrow(DBHelper.LoyaltyCardDbIds.HEADER_COLOR)));
             assertEquals(0, cursor.getInt(cursor.getColumnIndexOrThrow(DBHelper.LoyaltyCardDbIds.STAR_STATUS)));
             assertEquals(0, cursor.getInt(cursor.getColumnIndexOrThrow(DBHelper.LoyaltyCardDbIds.ARCHIVE_STATUS)));
@@ -208,10 +214,10 @@ public class DatabaseTest {
         for (int index = CARDS_TO_ADD - 1; index >= 0; index--) {
             if (index == CARDS_TO_ADD - 1) {
                 id = DBHelper.insertLoyaltyCard(mDatabase, "store" + index, "note" + index, null, null, new BigDecimal("0"), null, "cardId" + index,
-                        null, CatimaBarcode.fromBarcode(BarcodeFormat.UPC_A), index, 1, null,0);
+                        null, CatimaBarcode.fromBarcode(BarcodeFormat.UPC_A), null, index, 1, null,0);
             } else {
                 id = DBHelper.insertLoyaltyCard(mDatabase, "store" + index, "note" + index, null, null, new BigDecimal("0"), null, "cardId" + index,
-                        null, CatimaBarcode.fromBarcode(BarcodeFormat.UPC_A), index, 0, null,0);
+                        null, CatimaBarcode.fromBarcode(BarcodeFormat.UPC_A), null, index, 0, null,0);
             }
             boolean result = (id != -1);
             assertTrue(result);
@@ -235,6 +241,7 @@ public class DatabaseTest {
         assertEquals("cardId" + index, cursor.getString(cursor.getColumnIndexOrThrow(DBHelper.LoyaltyCardDbIds.CARD_ID)));
         assertEquals(null, cursor.getString(cursor.getColumnIndexOrThrow(DBHelper.LoyaltyCardDbIds.BARCODE_ID)));
         assertEquals(BarcodeFormat.UPC_A.toString(), cursor.getString(cursor.getColumnIndexOrThrow(DBHelper.LoyaltyCardDbIds.BARCODE_TYPE)));
+        assertEquals(null, cursor.getString(cursor.getColumnIndexOrThrow(DBHelper.LoyaltyCardDbIds.BARCODE_ENCODING)));
         assertEquals(index, cursor.getInt(cursor.getColumnIndexOrThrow(DBHelper.LoyaltyCardDbIds.HEADER_COLOR)));
         assertEquals(1, cursor.getInt(cursor.getColumnIndexOrThrow(DBHelper.LoyaltyCardDbIds.STAR_STATUS)));
 
@@ -310,7 +317,7 @@ public class DatabaseTest {
     public void updateGroup() {
         // Create card
         assertEquals(0, DBHelper.getLoyaltyCardCount(mDatabase));
-        long id = DBHelper.insertLoyaltyCard(mDatabase, "store", "note", null, null, new BigDecimal("0"), null, "cardId", null, CatimaBarcode.fromBarcode(BarcodeFormat.UPC_A), DEFAULT_HEADER_COLOR, 0, null,0);
+        long id = DBHelper.insertLoyaltyCard(mDatabase, "store", "note", null, null, new BigDecimal("0"), null, "cardId", null, CatimaBarcode.fromBarcode(BarcodeFormat.UPC_A), null, DEFAULT_HEADER_COLOR, 0, null,0);
         boolean result = (id != -1);
         assertTrue(result);
         assertEquals(1, DBHelper.getLoyaltyCardCount(mDatabase));
@@ -422,7 +429,7 @@ public class DatabaseTest {
     public void cardAddAndRemoveGroups() {
         // Create card
         assertEquals(0, DBHelper.getLoyaltyCardCount(mDatabase));
-        long id = DBHelper.insertLoyaltyCard(mDatabase, "store", "note", null, null, new BigDecimal("0"), null, "cardId", null, CatimaBarcode.fromBarcode(BarcodeFormat.UPC_A), DEFAULT_HEADER_COLOR, 0, null,0);
+        long id = DBHelper.insertLoyaltyCard(mDatabase, "store", "note", null, null, new BigDecimal("0"), null, "cardId", null, CatimaBarcode.fromBarcode(BarcodeFormat.UPC_A), null, DEFAULT_HEADER_COLOR, 0, null,0);
         boolean result = (id != -1);
         assertTrue(result);
         assertEquals(1, DBHelper.getLoyaltyCardCount(mDatabase));
@@ -490,6 +497,7 @@ public class DatabaseTest {
         assertEquals("cardId", card.cardId);
         assertEquals(null, card.barcodeId);
         assertEquals(BarcodeFormat.UPC_A, card.barcodeType.format());
+        assertEquals(null, card.barcodeEncoding);
         assertEquals(null, card.headerColor);
         assertEquals(0, card.starStatus);
         assertEquals(0, card.lastUsed);
@@ -507,6 +515,7 @@ public class DatabaseTest {
         assertEquals("cardId", card2.cardId);
         assertEquals(null, card2.barcodeId);
         assertEquals(null, card2.barcodeType); // Empty string should've become null
+        assertEquals(null, card.barcodeEncoding);
         assertEquals(null, card2.headerColor);
         assertEquals(0, card2.starStatus);
         assertEquals(0, card2.lastUsed);
@@ -516,7 +525,7 @@ public class DatabaseTest {
 
     @Test
     public void updateGiftCardOnlyBalance() {
-        long id = DBHelper.insertLoyaltyCard(mDatabase, "store", "note", null, null, new BigDecimal("100"), null, "cardId", null, CatimaBarcode.fromBarcode(BarcodeFormat.UPC_A), DEFAULT_HEADER_COLOR, 0, null,0);
+        long id = DBHelper.insertLoyaltyCard(mDatabase, "store", "note", null, null, new BigDecimal("100"), null, "cardId", null, CatimaBarcode.fromBarcode(BarcodeFormat.UPC_A), null, DEFAULT_HEADER_COLOR, 0, null,0);
         boolean result = (id != -1);
         assertTrue(result);
         assertEquals(1, DBHelper.getLoyaltyCardCount(mDatabase));
@@ -536,6 +545,7 @@ public class DatabaseTest {
         assertEquals("cardId", loyaltyCard.cardId);
         assertEquals(null, loyaltyCard.barcodeId);
         assertEquals(BarcodeFormat.UPC_A, loyaltyCard.barcodeType.format());
+        assertEquals(null, loyaltyCard.barcodeEncoding);
         assertEquals(DEFAULT_HEADER_COLOR, loyaltyCard.headerColor);
         assertEquals(0, loyaltyCard.starStatus);
         assertEquals(0, loyaltyCard.archiveStatus);

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

@@ -36,6 +36,7 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStreamWriter;
 import java.math.BigDecimal;
+import java.nio.charset.StandardCharsets;
 import java.time.Duration;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -73,7 +74,7 @@ public class ImportExportTest {
         for (int index = cardsToAdd; index > 4; index--) {
             String storeName = String.format("store, \"%4d", index);
             String note = String.format("note, \"%4d", index);
-            long id = DBHelper.insertLoyaltyCard(mDatabase, storeName, note, null, null, new BigDecimal(String.valueOf(index)), null, BARCODE_DATA, null, BARCODE_TYPE, index, 1, null,0);
+            long id = DBHelper.insertLoyaltyCard(mDatabase, storeName, note, null, null, new BigDecimal(String.valueOf(index)), null, BARCODE_DATA, null, BARCODE_TYPE, null,  index, 1, null,0);
             boolean result = (id != -1);
             assertTrue(result);
         }
@@ -81,7 +82,7 @@ public class ImportExportTest {
             String storeName = String.format("store, \"%4d", index);
             String note = String.format("note, \"%4d", index);
             //if index is even
-            long id = DBHelper.insertLoyaltyCard(mDatabase, storeName, note, null, null, new BigDecimal(String.valueOf(index)), null, BARCODE_DATA, null, BARCODE_TYPE, index, 0, null,0);
+            long id = DBHelper.insertLoyaltyCard(mDatabase, storeName, note, null, null, new BigDecimal(String.valueOf(index)), null, BARCODE_DATA, null, BARCODE_TYPE, null, index, 0, null,0);
             boolean result = (id != -1);
             assertTrue(result);
         }
@@ -90,7 +91,7 @@ public class ImportExportTest {
 
     @Test
     public void addLoyaltyCardsWithExpiryNeverPastTodayFuture() {
-        long id = DBHelper.insertLoyaltyCard(mDatabase, "No Expiry", "", null, null, new BigDecimal("0"), null, BARCODE_DATA, null, BARCODE_TYPE, 0, 0, null,0);
+        long id = DBHelper.insertLoyaltyCard(mDatabase, "No Expiry", "", null, null, new BigDecimal("0"), null, BARCODE_DATA, null, BARCODE_TYPE, null, 0, 0, null,0);
         boolean result = (id != -1);
         assertTrue(result);
 
@@ -104,10 +105,11 @@ public class ImportExportTest {
         assertEquals(BARCODE_DATA, card.cardId);
         assertEquals(null, card.barcodeId);
         assertEquals(BARCODE_TYPE.format(), card.barcodeType.format());
+        assertEquals(null, card.barcodeEncoding);
         assertEquals(Integer.valueOf(0), card.headerColor);
         assertEquals(0, card.starStatus);
 
-        id = DBHelper.insertLoyaltyCard(mDatabase, "Past", "", null, new Date((long) 1), new BigDecimal("0"), null, BARCODE_DATA, null, BARCODE_TYPE, 0, 0, null,0);
+        id = DBHelper.insertLoyaltyCard(mDatabase, "Past", "", null, new Date((long) 1), new BigDecimal("0"), null, BARCODE_DATA, null, BARCODE_TYPE, null, 0, 0, null,0);
         result = (id != -1);
         assertTrue(result);
 
@@ -121,10 +123,11 @@ public class ImportExportTest {
         assertEquals(BARCODE_DATA, card.cardId);
         assertEquals(null, card.barcodeId);
         assertEquals(BARCODE_TYPE.format(), card.barcodeType.format());
+        assertEquals(null, card.barcodeEncoding);
         assertEquals(Integer.valueOf(0), card.headerColor);
         assertEquals(0, card.starStatus);
 
-        id = DBHelper.insertLoyaltyCard(mDatabase, "Today", "", null, new Date(), new BigDecimal("0"), null, BARCODE_DATA, null, BARCODE_TYPE, 0, 0, null,0);
+        id = DBHelper.insertLoyaltyCard(mDatabase, "Today", "", null, new Date(), new BigDecimal("0"), null, BARCODE_DATA, null, BARCODE_TYPE, null, 0, 0, null,0);
         result = (id != -1);
         assertTrue(result);
 
@@ -139,12 +142,13 @@ public class ImportExportTest {
         assertEquals(BARCODE_DATA, card.cardId);
         assertEquals(null, card.barcodeId);
         assertEquals(BARCODE_TYPE.format(), card.barcodeType.format());
+        assertEquals(null, card.barcodeEncoding);
         assertEquals(Integer.valueOf(0), card.headerColor);
         assertEquals(0, card.starStatus);
 
         // This will break after 19 January 2038
         // If someone is still maintaining this code base by then: I love you
-        id = DBHelper.insertLoyaltyCard(mDatabase, "Future", "", null, new Date(2147483648000L), new BigDecimal("0"), null, BARCODE_DATA, null, BARCODE_TYPE, 0, 0, null,0);
+        id = DBHelper.insertLoyaltyCard(mDatabase, "Future", "", null, new Date(2147483648000L), new BigDecimal("0"), null, BARCODE_DATA, null, BARCODE_TYPE, null, 0, 0, null,0);
         result = (id != -1);
         assertTrue(result);
 
@@ -158,6 +162,7 @@ public class ImportExportTest {
         assertEquals(BARCODE_DATA, card.cardId);
         assertEquals(null, card.barcodeId);
         assertEquals(BARCODE_TYPE.format(), card.barcodeType.format());
+        assertEquals(null, card.barcodeEncoding);
         assertEquals(Integer.valueOf(0), card.headerColor);
         assertEquals(0, card.starStatus);
 
@@ -188,6 +193,7 @@ public class ImportExportTest {
             assertEquals(BARCODE_DATA, card.cardId);
             assertEquals(null, card.barcodeId);
             assertEquals(BARCODE_TYPE.format(), card.barcodeType.format());
+            assertEquals(null, card.barcodeEncoding);
             assertEquals(Integer.valueOf(index), card.headerColor);
             assertEquals(0, card.starStatus);
 
@@ -219,6 +225,7 @@ public class ImportExportTest {
             assertEquals(BARCODE_DATA, card.cardId);
             assertEquals(null, card.barcodeId);
             assertEquals(BARCODE_TYPE.format(), card.barcodeType.format());
+            assertEquals(null, card.barcodeEncoding);
             assertEquals(Integer.valueOf(index), card.headerColor);
             assertEquals(0, card.starStatus);
         }
@@ -250,6 +257,7 @@ public class ImportExportTest {
             assertEquals(BARCODE_DATA, card.cardId);
             assertEquals(null, card.barcodeId);
             assertEquals(BARCODE_TYPE.format(), card.barcodeType.format());
+            assertEquals(null, card.barcodeEncoding);
             assertEquals(Integer.valueOf(index), card.headerColor);
             assertEquals(1, card.starStatus);
 
@@ -272,6 +280,7 @@ public class ImportExportTest {
             assertEquals(BARCODE_DATA, card.cardId);
             assertEquals(null, card.barcodeId);
             assertEquals(BARCODE_TYPE.format(), card.barcodeType.format());
+            assertEquals(null, card.barcodeEncoding);
             assertEquals(Integer.valueOf(index), card.headerColor);
             assertEquals(0, card.starStatus);
 
@@ -660,6 +669,7 @@ public class ImportExportTest {
         assertEquals("12345", card.cardId);
         assertEquals(null, card.barcodeId);
         assertEquals(BarcodeFormat.AZTEC, card.barcodeType.format());
+        assertEquals(null, card.barcodeEncoding);
         assertNull(card.headerColor);
         assertEquals(0, card.starStatus);
 
@@ -686,6 +696,7 @@ public class ImportExportTest {
         assertEquals("12345", card.cardId);
         assertEquals(null, card.barcodeId);
         assertEquals(BarcodeFormat.AZTEC, card.barcodeType.format());
+        assertEquals(null, card.barcodeEncoding);
         assertNull(card.headerColor);
         assertEquals(0, card.starStatus);
 
@@ -724,6 +735,7 @@ public class ImportExportTest {
         assertEquals("12345", card.cardId);
         assertEquals(null, card.barcodeId);
         assertEquals(null, card.barcodeType);
+        assertEquals(null, card.barcodeEncoding);
         assertEquals(1, (long) card.headerColor);
         assertEquals(0, card.starStatus);
 
@@ -750,6 +762,7 @@ public class ImportExportTest {
         assertEquals("12345", card.cardId);
         assertEquals(null, card.barcodeId);
         assertEquals(BarcodeFormat.AZTEC, card.barcodeType.format());
+        assertEquals(null, card.barcodeEncoding);
         assertEquals(1, (long) card.headerColor);
         assertEquals(1, card.starStatus);
 
@@ -776,6 +789,7 @@ public class ImportExportTest {
         assertEquals("12345", card.cardId);
         assertEquals(null, card.barcodeId);
         assertEquals(BarcodeFormat.AZTEC, card.barcodeType.format());
+        assertEquals(null, card.barcodeEncoding);
         assertEquals(1, (long) card.headerColor);
         assertEquals(0, card.starStatus);
 
@@ -809,6 +823,7 @@ public class ImportExportTest {
         assertEquals("12345", card.cardId);
         assertEquals(null, card.barcodeId);
         assertEquals(BarcodeFormat.AZTEC, card.barcodeType.format());
+        assertEquals(null, card.barcodeEncoding);
         assertEquals(1, (long) card.headerColor);
         assertEquals(0, card.starStatus);
 
@@ -830,7 +845,7 @@ public class ImportExportTest {
         HashMap<Integer, Bitmap> loyaltyCardIconImages = new HashMap<>();
 
         // Create card 1
-        int loyaltyCardId = (int) DBHelper.insertLoyaltyCard(mDatabase, "Card 1", "Note 1", new Date(1601510400), new Date(1618053234), new BigDecimal("100"), Currency.getInstance("USD"), "1234", "5432", CatimaBarcode.fromBarcode(BarcodeFormat.QR_CODE), 1, 0, null,0);
+        int loyaltyCardId = (int) DBHelper.insertLoyaltyCard(mDatabase, "Card 1", "Note 1", new Date(1601510400), new Date(1618053234), new BigDecimal("100"), Currency.getInstance("USD"), "1234", "5432", CatimaBarcode.fromBarcode(BarcodeFormat.QR_CODE), StandardCharsets.UTF_8, 1, 0, null,0);
         loyaltyCardHashMap.put(loyaltyCardId, DBHelper.getLoyaltyCard(activity.getApplicationContext(), mDatabase, loyaltyCardId));
         DBHelper.insertGroup(mDatabase, "One");
         List<Group> groups = Arrays.asList(DBHelper.getGroup(mDatabase, "One"));
@@ -844,7 +859,7 @@ public class ImportExportTest {
         loyaltyCardIconImages.put(loyaltyCardId, bitmap1);
 
         // Create card 2
-        loyaltyCardId = (int) DBHelper.insertLoyaltyCard(mDatabase, "Card 2", "", null, null, new BigDecimal(0), null, "123456", null, null, 2, 1, null,0);
+        loyaltyCardId = (int) DBHelper.insertLoyaltyCard(mDatabase, "Card 2", "", null, null, new BigDecimal(0), null, "123456", null, null, null, 2, 1, null,0);
         loyaltyCardHashMap.put(loyaltyCardId, DBHelper.getLoyaltyCard(activity.getApplicationContext(), mDatabase, loyaltyCardId));
 
         // Export everything
@@ -875,6 +890,7 @@ public class ImportExportTest {
             assertEquals(loyaltyCard.barcodeId, dbLoyaltyCard.barcodeId);
             assertEquals(loyaltyCard.starStatus, dbLoyaltyCard.starStatus);
             assertEquals(loyaltyCard.barcodeType != null ? loyaltyCard.barcodeType.format() : null, dbLoyaltyCard.barcodeType != null ? dbLoyaltyCard.barcodeType.format() : null);
+            assertEquals(loyaltyCard.barcodeEncoding != null ? loyaltyCard.barcodeEncoding : null, dbLoyaltyCard.barcodeEncoding != null ? dbLoyaltyCard.barcodeEncoding : null);
             assertEquals(loyaltyCard.balanceType, dbLoyaltyCard.balanceType);
             assertEquals(loyaltyCard.headerColor, dbLoyaltyCard.headerColor);
 
@@ -930,7 +946,7 @@ public class ImportExportTest {
         // Import the CSV data
         ImportExportResult result = MultiFormatImporter.importData(activity.getApplicationContext(), mDatabase, inputStream, DataFormat.Catima, null);
         assertEquals(ImportExportResultType.Success, result.resultType());
-        assertEquals(7, DBHelper.getLoyaltyCardCount(mDatabase));
+        assertEquals(8, DBHelper.getLoyaltyCardCount(mDatabase));
         assertEquals(3, DBHelper.getGroupCount(mDatabase));
 
         // Check all groups
@@ -961,6 +977,7 @@ public class ImportExportTest {
         assertEquals("1234", card1.cardId);
         assertEquals("5432", card1.barcodeId);
         assertEquals(BarcodeFormat.QR_CODE, card1.barcodeType.format());
+        assertEquals(null, card1.barcodeEncoding);
         assertEquals(1, (long) card1.headerColor);
         assertEquals(0, card1.starStatus);
         assertEquals(null, Utils.retrieveCardImage(activity.getApplicationContext(), card1.id, ImageLocationType.front));
@@ -978,6 +995,7 @@ public class ImportExportTest {
         assertEquals("a", card8.cardId);
         assertEquals(null, card8.barcodeId);
         assertEquals(null, card8.barcodeType);
+        assertEquals(null, card8.barcodeEncoding);
         assertEquals(-5317, (long) card8.headerColor);
         assertEquals(0, card8.starStatus);
         assertEquals(null, Utils.retrieveCardImage(activity.getApplicationContext(), card8.id, ImageLocationType.front));
@@ -995,6 +1013,7 @@ public class ImportExportTest {
         assertEquals("A", card2.cardId);
         assertEquals(null, card2.barcodeId);
         assertEquals(null, card2.barcodeType);
+        assertEquals(null, card2.barcodeEncoding);
         assertEquals(-9977996, (long) card2.headerColor);
         assertEquals(0, card2.starStatus);
         assertEquals(null, Utils.retrieveCardImage(activity.getApplicationContext(), card2.id, ImageLocationType.front));
@@ -1012,6 +1031,7 @@ public class ImportExportTest {
         assertEquals("dhd", card3.cardId);
         assertEquals(null, card3.barcodeId);
         assertEquals(null, card3.barcodeType);
+        assertEquals(null, card3.barcodeEncoding);
         assertEquals(-9977996, (long) card3.headerColor);
         assertEquals(0, card3.starStatus);
         assertEquals(null, Utils.retrieveCardImage(activity.getApplicationContext(), card3.id, ImageLocationType.front));
@@ -1029,6 +1049,7 @@ public class ImportExportTest {
         assertEquals("dhshsvshs", card4.cardId);
         assertEquals(null, card4.barcodeId);
         assertEquals(null, card4.barcodeType);
+        assertEquals(null, card4.barcodeEncoding);
         assertEquals(-10902850, (long) card4.headerColor);
         assertEquals(1, card4.starStatus);
         assertEquals(null, Utils.retrieveCardImage(activity.getApplicationContext(), card4.id, ImageLocationType.front));
@@ -1046,6 +1067,7 @@ public class ImportExportTest {
         assertEquals("98765432", card5.cardId);
         assertEquals("23456", card5.barcodeId);
         assertEquals(BarcodeFormat.CODE_128, card5.barcodeType.format());
+        assertEquals(StandardCharsets.ISO_8859_1, card5.barcodeEncoding);
         assertEquals(-10902850, (long) card5.headerColor);
         assertEquals(0, card5.starStatus);
         assertEquals(null, Utils.retrieveCardImage(activity.getApplicationContext(), card5.id, ImageLocationType.front));
@@ -1063,12 +1085,31 @@ public class ImportExportTest {
         assertEquals("a", card6.cardId);
         assertEquals("-5317", card6.barcodeId);
         assertEquals(BarcodeFormat.AZTEC, card6.barcodeType.format());
+        assertEquals(null, card6.barcodeEncoding);
         assertEquals(null, card6.headerColor);
         assertEquals(0, card6.starStatus);
         assertEquals(null, Utils.retrieveCardImage(activity.getApplicationContext(), card6.id, ImageLocationType.front));
         assertEquals(null, Utils.retrieveCardImage(activity.getApplicationContext(), card6.id, ImageLocationType.back));
         assertEquals(null, Utils.retrieveCardImage(activity.getApplicationContext(), card6.id, ImageLocationType.icon));
 
+        LoyaltyCard card9 = DBHelper.getLoyaltyCard(activity.getApplicationContext(), mDatabase, 9);
+
+        assertEquals("cheese", card9.store);
+        assertEquals("", card9.note);
+        assertEquals(null, card9.validFrom);
+        assertEquals(null, card9.expiry);
+        assertEquals(new BigDecimal("0"), card9.balance);
+        assertEquals(null, card9.balanceType);
+        assertEquals("Käseschnitte", card9.cardId);
+        assertEquals(null, card9.barcodeId);
+        assertEquals(BarcodeFormat.AZTEC, card9.barcodeType.format());
+        assertEquals(StandardCharsets.UTF_8, card9.barcodeEncoding);
+        assertEquals(-5414233, (long) card9.headerColor);
+        assertEquals(0, card9.starStatus);
+        assertEquals(null, Utils.retrieveCardImage(activity.getApplicationContext(), card9.id, ImageLocationType.front));
+        assertEquals(null, Utils.retrieveCardImage(activity.getApplicationContext(), card9.id, ImageLocationType.back));
+        assertEquals(null, Utils.retrieveCardImage(activity.getApplicationContext(), card9.id, ImageLocationType.icon));
+
         TestHelpers.getEmptyDb(activity);
     }
 
@@ -1092,6 +1133,7 @@ public class ImportExportTest {
         assertEquals("82825292629272726", card.cardId);
         assertEquals(null, card.barcodeId);
         assertEquals(null, card.barcodeType);
+        assertEquals(null, card.barcodeEncoding);
         assertEquals(0, card.starStatus);
 
         card = DBHelper.getLoyaltyCard(activity.getApplicationContext(), mDatabase, 2);
@@ -1105,6 +1147,7 @@ public class ImportExportTest {
         assertEquals("123456", card.cardId);
         assertEquals(null, card.barcodeId);
         assertEquals(null, card.barcodeType);
+        assertEquals(null, card.barcodeEncoding);
         assertEquals(0, card.starStatus);
 
         card = DBHelper.getLoyaltyCard(activity.getApplicationContext(), mDatabase, 3);
@@ -1118,6 +1161,7 @@ public class ImportExportTest {
         assertEquals("123435363634", card.cardId);
         assertEquals(null, card.barcodeId);
         assertEquals(null, card.barcodeType);
+        assertEquals(null, card.barcodeEncoding);
         assertEquals(0, card.starStatus);
 
         TestHelpers.getEmptyDb(activity);
@@ -1143,6 +1187,7 @@ public class ImportExportTest {
         assertEquals("123456", card.cardId);
         assertEquals(null, card.barcodeId);
         assertEquals(BarcodeFormat.CODE_128, card.barcodeType.format());
+        assertEquals(null, card.barcodeEncoding);
         assertEquals(Color.GRAY, (long) card.headerColor);
         assertEquals(0, card.starStatus);
 
@@ -1157,6 +1202,7 @@ public class ImportExportTest {
         assertEquals("26846363", card.cardId);
         assertEquals(null, card.barcodeId);
         assertEquals(BarcodeFormat.CODE_39, card.barcodeType.format());
+        assertEquals(null, card.barcodeEncoding);
         assertEquals(Color.rgb(128, 0, 128), (long) card.headerColor);
         assertEquals(0, card.starStatus);
 

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

@@ -20,6 +20,7 @@ import org.robolectric.RobolectricTestRunner;
 import java.io.InvalidObjectException;
 import java.io.UnsupportedEncodingException;
 import java.math.BigDecimal;
+import java.nio.charset.StandardCharsets;
 import java.util.Currency;
 import java.util.Date;
 
@@ -41,7 +42,7 @@ public class ImportURITest {
         // Generate card
         Date date = new Date();
 
-        DBHelper.insertLoyaltyCard(mDatabase, "store", "This note contains evil symbols like & and = that will break the parser if not escaped right $#!%()*+;:á", date, date, new BigDecimal("100"), null, BarcodeFormat.UPC_E.toString(), BarcodeFormat.UPC_A.toString(), CatimaBarcode.fromBarcode(BarcodeFormat.QR_CODE), Color.BLACK, 1, null,0);
+        DBHelper.insertLoyaltyCard(mDatabase, "store", "This note contains evil symbols like & and = that will break the parser if not escaped right $#!%()*+;:á", date, date, new BigDecimal("100"), null, BarcodeFormat.UPC_E.toString(), BarcodeFormat.UPC_A.toString(), CatimaBarcode.fromBarcode(BarcodeFormat.QR_CODE), StandardCharsets.UTF_8, Color.BLACK, 1, null,0);
 
         // Get card
         LoyaltyCard card = DBHelper.getLoyaltyCard(activity.getApplicationContext(), mDatabase, 1);
@@ -62,6 +63,7 @@ public class ImportURITest {
         assertEquals(card.cardId, parsedCard.cardId);
         assertEquals(card.barcodeId, parsedCard.barcodeId);
         assertEquals(card.barcodeType.format(), parsedCard.barcodeType.format());
+        assertEquals(card.barcodeEncoding, parsedCard.barcodeEncoding);
         assertEquals(card.headerColor, parsedCard.headerColor);
         // No export of starStatus for export URL foreseen therefore 0 will be imported
         assertEquals(0, parsedCard.starStatus);
@@ -71,7 +73,7 @@ public class ImportURITest {
     @Test
     public void ensureNoCrashOnMissingHeaderFields() throws InvalidObjectException, UnsupportedEncodingException {
         // Generate card
-        DBHelper.insertLoyaltyCard(mDatabase, "store", "note", null, null, new BigDecimal("10.00"), Currency.getInstance("EUR"), BarcodeFormat.UPC_A.toString(), null, CatimaBarcode.fromBarcode(BarcodeFormat.QR_CODE), null, 0, null,0);
+        DBHelper.insertLoyaltyCard(mDatabase, "store", "note", null, null, new BigDecimal("10.00"), Currency.getInstance("EUR"), BarcodeFormat.UPC_A.toString(), null, CatimaBarcode.fromBarcode(BarcodeFormat.QR_CODE), null, null, 0, null,0);
 
         // Get card
         LoyaltyCard card = DBHelper.getLoyaltyCard(activity.getApplicationContext(), mDatabase, 1);
@@ -92,6 +94,7 @@ public class ImportURITest {
         assertEquals(card.cardId, parsedCard.cardId);
         assertEquals(card.barcodeId, parsedCard.barcodeId);
         assertEquals(card.barcodeType.format(), parsedCard.barcodeType.format());
+        assertEquals(card.barcodeEncoding, parsedCard.barcodeEncoding);
         assertNull(parsedCard.headerColor);
         // No export of starStatus for export URL foreseen therefore 0 will be imported
         assertEquals(0, parsedCard.starStatus);
@@ -101,7 +104,7 @@ public class ImportURITest {
     @Test
     public void parseWithTrailingSlash() throws InvalidObjectException, UnsupportedEncodingException {
         // Generate card
-        DBHelper.insertLoyaltyCard(mDatabase, "store", "note", null, null, new BigDecimal("10.00"), Currency.getInstance("EUR"), BarcodeFormat.UPC_A.toString(), null, CatimaBarcode.fromBarcode(BarcodeFormat.QR_CODE), null, 0, null,0);
+        DBHelper.insertLoyaltyCard(mDatabase, "store", "note", null, null, new BigDecimal("10.00"), Currency.getInstance("EUR"), BarcodeFormat.UPC_A.toString(), null, CatimaBarcode.fromBarcode(BarcodeFormat.QR_CODE), StandardCharsets.UTF_8, null, 0, null,0);
 
         // Get card
         LoyaltyCard card = DBHelper.getLoyaltyCard(activity.getApplicationContext(), mDatabase, 1);
@@ -123,6 +126,7 @@ public class ImportURITest {
         assertEquals(card.cardId, parsedCard.cardId);
         assertEquals(card.barcodeId, parsedCard.barcodeId);
         assertEquals(card.barcodeType.format(), parsedCard.barcodeType.format());
+        assertEquals(card.barcodeEncoding, parsedCard.barcodeEncoding);
         assertNull(parsedCard.headerColor);
         // No export of starStatus for export URL foreseen therefore 0 will be imported
         assertEquals(0, parsedCard.starStatus);
@@ -183,6 +187,7 @@ public class ImportURITest {
             assertEquals("12345", parsedCard.cardId);
             assertEquals(null, parsedCard.barcodeId);
             assertEquals(BarcodeFormat.ITF, parsedCard.barcodeType.format());
+            assertEquals(null, parsedCard.barcodeEncoding);
             assertEquals(Integer.valueOf(-416706), parsedCard.headerColor);
             assertEquals(0, parsedCard.starStatus);
         }

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

@@ -96,7 +96,7 @@ public class LoyaltyCardCursorAdapterTest {
 
     @Test
     public void TestCursorAdapterEmptyNote() {
-        DBHelper.insertLoyaltyCard(mDatabase, "store", "", null, null, new BigDecimal("0"), null, "cardId", null, CatimaBarcode.fromBarcode(BarcodeFormat.UPC_A), Color.BLACK, 0, null,0);
+        DBHelper.insertLoyaltyCard(mDatabase, "store", "", null, null, new BigDecimal("0"), null, "cardId", null, CatimaBarcode.fromBarcode(BarcodeFormat.UPC_A), null, Color.BLACK, 0, null,0);
         LoyaltyCard card = DBHelper.getLoyaltyCard(activity.getApplicationContext(), mDatabase, 1);
 
         Cursor cursor = DBHelper.getLoyaltyCardCursor(mDatabase);
@@ -111,7 +111,7 @@ public class LoyaltyCardCursorAdapterTest {
 
     @Test
     public void TestCursorAdapterWithNote() {
-        DBHelper.insertLoyaltyCard(mDatabase, "store", "note", null, null, new BigDecimal("0"), null, "cardId", null, CatimaBarcode.fromBarcode(BarcodeFormat.UPC_A), Color.BLACK, 0, null,0);
+        DBHelper.insertLoyaltyCard(mDatabase, "store", "note", null, null, new BigDecimal("0"), null, "cardId", null, CatimaBarcode.fromBarcode(BarcodeFormat.UPC_A), null, Color.BLACK, 0, null,0);
         LoyaltyCard card = DBHelper.getLoyaltyCard(activity.getApplicationContext(), mDatabase, 1);
 
         Cursor cursor = DBHelper.getLoyaltyCardCursor(mDatabase);
@@ -126,10 +126,10 @@ public class LoyaltyCardCursorAdapterTest {
 
     @Test
     public void TestCursorAdapterStarring() {
-        assertNotEquals(-1, DBHelper.insertLoyaltyCard(mDatabase, "storeA", "note", null, null, new BigDecimal("0"), null, "cardId", null, CatimaBarcode.fromBarcode(BarcodeFormat.UPC_A), Color.BLACK, 0, null,1));
-        assertNotEquals(-1, DBHelper.insertLoyaltyCard(mDatabase, "storeB", "note", null, null, new BigDecimal("0"), null, "cardId", null, CatimaBarcode.fromBarcode(BarcodeFormat.UPC_A), Color.BLACK, 1, null,1));
-        assertNotEquals(-1, DBHelper.insertLoyaltyCard(mDatabase, "storeC", "note", null, null, new BigDecimal("0"), null, "cardId", null, CatimaBarcode.fromBarcode(BarcodeFormat.UPC_A), Color.BLACK, 0, null,0));
-        assertNotEquals(-1, DBHelper.insertLoyaltyCard(mDatabase, "storeD", "note", null, null, new BigDecimal("0"), null, "cardId", null, CatimaBarcode.fromBarcode(BarcodeFormat.UPC_A), Color.BLACK, 1, null,0));
+        assertNotEquals(-1, DBHelper.insertLoyaltyCard(mDatabase, "storeA", "note", null, null, new BigDecimal("0"), null, "cardId", null, CatimaBarcode.fromBarcode(BarcodeFormat.UPC_A), null, Color.BLACK, 0, null,1));
+        assertNotEquals(-1, DBHelper.insertLoyaltyCard(mDatabase, "storeB", "note", null, null, new BigDecimal("0"), null, "cardId", null, CatimaBarcode.fromBarcode(BarcodeFormat.UPC_A), null, Color.BLACK, 1, null,1));
+        assertNotEquals(-1, DBHelper.insertLoyaltyCard(mDatabase, "storeC", "note", null, null, new BigDecimal("0"), null, "cardId", null, CatimaBarcode.fromBarcode(BarcodeFormat.UPC_A), null, Color.BLACK, 0, null,0));
+        assertNotEquals(-1, DBHelper.insertLoyaltyCard(mDatabase, "storeD", "note", null, null, new BigDecimal("0"), null, "cardId", null, CatimaBarcode.fromBarcode(BarcodeFormat.UPC_A), null, Color.BLACK, 1, null,0));
 
         assertEquals(4, DBHelper.getLoyaltyCardCount(mDatabase));
 
@@ -177,7 +177,7 @@ public class LoyaltyCardCursorAdapterTest {
 
     @Test
     public void TestCursorAdapter0Points() {
-        DBHelper.insertLoyaltyCard(mDatabase, "store", "", null, null, new BigDecimal("0"), null, "cardId", null, CatimaBarcode.fromBarcode(BarcodeFormat.UPC_A), Color.BLACK, 0, null,0);
+        DBHelper.insertLoyaltyCard(mDatabase, "store", "", null, null, new BigDecimal("0"), null, "cardId", null, CatimaBarcode.fromBarcode(BarcodeFormat.UPC_A), null, Color.BLACK, 0, null,0);
         LoyaltyCard card = DBHelper.getLoyaltyCard(activity.getApplicationContext(), mDatabase, 1);
 
         Cursor cursor = DBHelper.getLoyaltyCardCursor(mDatabase);
@@ -192,7 +192,7 @@ public class LoyaltyCardCursorAdapterTest {
 
     @Test
     public void TestCursorAdapter0EUR() {
-        DBHelper.insertLoyaltyCard(mDatabase,"store", "", null, null, new BigDecimal("0"), Currency.getInstance("EUR"), "cardId", null, CatimaBarcode.fromBarcode(BarcodeFormat.UPC_A), Color.BLACK, 0, null,0);
+        DBHelper.insertLoyaltyCard(mDatabase,"store", "", null, null, new BigDecimal("0"), Currency.getInstance("EUR"), "cardId", null, CatimaBarcode.fromBarcode(BarcodeFormat.UPC_A), null, Color.BLACK, 0, null,0);
         LoyaltyCard card = DBHelper.getLoyaltyCard(activity.getApplicationContext(), mDatabase, 1);
 
         Cursor cursor = DBHelper.getLoyaltyCardCursor(mDatabase);
@@ -207,7 +207,7 @@ public class LoyaltyCardCursorAdapterTest {
 
     @Test
     public void TestCursorAdapter100Points() {
-        DBHelper.insertLoyaltyCard(mDatabase, "store", "note", null, null, new BigDecimal("100"), null, "cardId", null, CatimaBarcode.fromBarcode(BarcodeFormat.UPC_A), Color.BLACK, 0, null,0);
+        DBHelper.insertLoyaltyCard(mDatabase, "store", "note", null, null, new BigDecimal("100"), null, "cardId", null, CatimaBarcode.fromBarcode(BarcodeFormat.UPC_A), null, Color.BLACK, 0, null,0);
         LoyaltyCard card = DBHelper.getLoyaltyCard(activity.getApplicationContext(), mDatabase, 1);
 
         Cursor cursor = DBHelper.getLoyaltyCardCursor(mDatabase);
@@ -222,7 +222,7 @@ public class LoyaltyCardCursorAdapterTest {
 
     @Test
     public void TestCursorAdapter10USD() {
-        DBHelper.insertLoyaltyCard(mDatabase, "store", "note", null, null, new BigDecimal("10.00"), Currency.getInstance("USD"), "cardId", null, CatimaBarcode.fromBarcode(BarcodeFormat.UPC_A), Color.BLACK, 0, null,0);
+        DBHelper.insertLoyaltyCard(mDatabase, "store", "note", null, null, new BigDecimal("10.00"), Currency.getInstance("USD"), "cardId", null, CatimaBarcode.fromBarcode(BarcodeFormat.UPC_A), null, Color.BLACK, 0, null,0);
         LoyaltyCard card = DBHelper.getLoyaltyCard(activity.getApplicationContext(), mDatabase, 1);
 
         Cursor cursor = DBHelper.getLoyaltyCardCursor(mDatabase);

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

@@ -65,6 +65,8 @@ import org.robolectric.shadows.ShadowLog;
 
 import java.io.IOException;
 import java.math.BigDecimal;
+import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
 import java.text.DateFormat;
 import java.text.ParseException;
 import java.time.Instant;
@@ -133,6 +135,7 @@ public class LoyaltyCardViewActivityTest {
                                               final String cardId,
                                               final String barcodeId,
                                               final String barcodeType,
+                                              final String barcodeEncoding,
                                               boolean creatingNewCard) throws ParseException {
         SQLiteDatabase database = new DBHelper(activity).getWritableDatabase();
         if (creatingNewCard) {
@@ -150,6 +153,7 @@ public class LoyaltyCardViewActivityTest {
         final TextView cardIdField = activity.findViewById(R.id.cardIdView);
         final TextView barcodeIdField = activity.findViewById(R.id.barcodeIdField);
         final TextView barcodeTypeField = activity.findViewById(R.id.barcodeTypeField);
+        final TextView barcodeEncodingField = activity.findViewById(R.id.barcodeEncodingField);
 
         storeField.setText(store);
         noteField.setText(note);
@@ -160,6 +164,7 @@ public class LoyaltyCardViewActivityTest {
         cardIdField.setText(cardId);
         barcodeIdField.setText(barcodeId);
         barcodeTypeField.setText(barcodeType);
+        barcodeEncodingField.setText(barcodeEncoding);
 
         assertEquals(false, activity.isFinishing());
         activity.findViewById(R.id.fabSave).performClick();
@@ -207,6 +212,14 @@ public class LoyaltyCardViewActivityTest {
         } else {
             assertEquals(CatimaBarcode.fromName(barcodeType).format(), card.barcodeType.format());
         }
+
+        // The special "Automatic" string shouldn't actually be written to the loyalty card
+        if (barcodeEncoding.equals(activity.getApplicationContext().getString(R.string.automatic))) {
+            assertEquals(null, card.barcodeEncoding);
+        } else {
+            assertEquals(Charset.forName(barcodeEncoding), card.barcodeEncoding);
+        }
+
         assertNotNull(card.headerColor);
 
         database.close();
@@ -323,6 +336,7 @@ public class LoyaltyCardViewActivityTest {
                                 final String expiryString, final String balanceString,
                                 final String balanceTypeString, final String cardId,
                                 final String barcodeId, final String barcodeType,
+                                final String barcodeEncoding,
                                 final Bitmap frontImage, final Bitmap backImage) {
         if (mode == ViewMode.VIEW_CARD) {
             checkFieldProperties(activity, R.id.main_image_description, View.VISIBLE, cardId, FieldTypeView.TextView);
@@ -338,6 +352,7 @@ public class LoyaltyCardViewActivityTest {
             checkFieldProperties(activity, R.id.cardIdView, View.VISIBLE, cardId, FieldTypeView.TextView);
             checkFieldProperties(activity, R.id.barcodeIdField, View.VISIBLE, barcodeId, FieldTypeView.TextView);
             checkFieldProperties(activity, R.id.barcodeTypeField, View.VISIBLE, barcodeType, FieldTypeView.TextView);
+            checkFieldProperties(activity, R.id.barcodeEncodingField, View.VISIBLE, barcodeEncoding, FieldTypeView.TextView);
             //checkFieldProperties(activity, R.id.barcode, View.VISIBLE, null, FieldTypeView.ImageView);
             checkFieldProperties(activity, R.id.frontImage, View.VISIBLE, frontImage, FieldTypeView.ImageView);
             checkFieldProperties(activity, R.id.backImage, View.VISIBLE, backImage, FieldTypeView.ImageView);
@@ -359,7 +374,7 @@ public class LoyaltyCardViewActivityTest {
         shadowOf(getMainLooper()).idle();
 
         // Check default settings
-        checkAllFields(activity, ViewMode.ADD_CARD, "", "", context.getString(R.string.anyDate), context.getString(R.string.never), "0", context.getString(R.string.points), "", context.getString(R.string.sameAsCardId), context.getString(R.string.noBarcode), null, null);
+        checkAllFields(activity, ViewMode.ADD_CARD, "", "", context.getString(R.string.anyDate), context.getString(R.string.never), "0", context.getString(R.string.points), "", context.getString(R.string.sameAsCardId), context.getString(R.string.noBarcode), context.getString(R.string.automatic), null, null);
     }
 
     @Test
@@ -379,7 +394,7 @@ public class LoyaltyCardViewActivityTest {
             System.out.println();
 
             if (!newCard) {
-                cardId = (int) DBHelper.insertLoyaltyCard(database, "store", "note", null, null, new BigDecimal("0"), null, EAN_BARCODE_DATA, null, EAN_BARCODE_TYPE, Color.BLACK, 0, null, 0);
+                cardId = (int) DBHelper.insertLoyaltyCard(database, "store", "note", null, null, new BigDecimal("0"), null, EAN_BARCODE_DATA, null, EAN_BARCODE_TYPE, StandardCharsets.UTF_8, Color.BLACK, 0, null, 0);
             } else {
                 cardId = null;
             }
@@ -394,7 +409,7 @@ public class LoyaltyCardViewActivityTest {
             shadowOf(getMainLooper()).idle();
 
             // Check default settings
-            checkAllFields(activity, newCard ? ViewMode.ADD_CARD : ViewMode.UPDATE_CARD, newCard ? "" : "store", newCard ? "" : "note", context.getString(R.string.anyDate), context.getString(R.string.never), "0", context.getString(R.string.points), newCard ? "" : EAN_BARCODE_DATA, context.getString(R.string.sameAsCardId), newCard ? context.getString(R.string.noBarcode) : EAN_BARCODE_TYPE.prettyName(), null, null);
+            checkAllFields(activity, newCard ? ViewMode.ADD_CARD : ViewMode.UPDATE_CARD, newCard ? "" : "store", newCard ? "" : "note", context.getString(R.string.anyDate), context.getString(R.string.never), "0", context.getString(R.string.points), newCard ? "" : EAN_BARCODE_DATA, context.getString(R.string.sameAsCardId), newCard ? context.getString(R.string.noBarcode) : EAN_BARCODE_TYPE.prettyName(), newCard ? context.getString(R.string.automatic) : StandardCharsets.UTF_8.name(), null, null);
 
             // Change everything
             final EditText storeField = activity.findViewById(R.id.storeNameEdit);
@@ -406,6 +421,7 @@ public class LoyaltyCardViewActivityTest {
             final EditText cardIdField = activity.findViewById(R.id.cardIdView);
             final EditText barcodeField = activity.findViewById(R.id.barcodeIdField);
             final EditText barcodeTypeField = activity.findViewById(R.id.barcodeTypeField);
+            final EditText barcodeEncodingField = activity.findViewById(R.id.barcodeEncodingField);
             final ImageView frontImageView = activity.findViewById(R.id.frontImage);
             final ImageView backImageView = activity.findViewById(R.id.backImage);
 
@@ -426,13 +442,14 @@ public class LoyaltyCardViewActivityTest {
             cardIdField.setText("12345678");
             barcodeField.setText("87654321");
             barcodeTypeField.setText(CatimaBarcode.fromBarcode(BarcodeFormat.QR_CODE).prettyName());
+            barcodeEncodingField.setText(StandardCharsets.ISO_8859_1.name());
             activity.setCardImage(ImageLocationType.front, frontImageView, frontBitmap, true);
             activity.setCardImage(ImageLocationType.back, backImageView, backBitmap, true);
 
             shadowOf(getMainLooper()).idle();
 
             // Check if changed
-            checkAllFields(activity, newCard ? ViewMode.ADD_CARD : ViewMode.UPDATE_CARD, "correct store", "correct note", DateFormat.getDateInstance(DateFormat.LONG).format(validFromDate), DateFormat.getDateInstance(DateFormat.LONG).format(expiryDate), "100.00", currency.getSymbol(), "12345678", "87654321", CatimaBarcode.fromBarcode(BarcodeFormat.QR_CODE).prettyName(), frontBitmap, backBitmap);
+            checkAllFields(activity, newCard ? ViewMode.ADD_CARD : ViewMode.UPDATE_CARD, "correct store", "correct note", DateFormat.getDateInstance(DateFormat.LONG).format(validFromDate), DateFormat.getDateInstance(DateFormat.LONG).format(expiryDate), "100.00", currency.getSymbol(), "12345678", "87654321", CatimaBarcode.fromBarcode(BarcodeFormat.QR_CODE).prettyName(), StandardCharsets.ISO_8859_1.name(), frontBitmap, backBitmap);
 
             // Resume
             activityController.pause();
@@ -441,7 +458,7 @@ public class LoyaltyCardViewActivityTest {
             shadowOf(getMainLooper()).idle();
 
             // Check if no changes lost
-            checkAllFields(activity, newCard ? ViewMode.ADD_CARD : ViewMode.UPDATE_CARD, "correct store", "correct note", DateFormat.getDateInstance(DateFormat.LONG).format(validFromDate), DateFormat.getDateInstance(DateFormat.LONG).format(expiryDate), "100.00", currency.getSymbol(), "12345678", "87654321", CatimaBarcode.fromBarcode(BarcodeFormat.QR_CODE).prettyName(), frontBitmap, backBitmap);
+            checkAllFields(activity, newCard ? ViewMode.ADD_CARD : ViewMode.UPDATE_CARD, "correct store", "correct note", DateFormat.getDateInstance(DateFormat.LONG).format(validFromDate), DateFormat.getDateInstance(DateFormat.LONG).format(expiryDate), "100.00", currency.getSymbol(), "12345678", "87654321", CatimaBarcode.fromBarcode(BarcodeFormat.QR_CODE).prettyName(), StandardCharsets.ISO_8859_1.name(), frontBitmap, backBitmap);
 
             // Rotate to landscape
             activity.setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE);
@@ -449,7 +466,7 @@ public class LoyaltyCardViewActivityTest {
             shadowOf(getMainLooper()).idle();
 
             // Check if no changes lost
-            checkAllFields(activity, newCard ? ViewMode.ADD_CARD : ViewMode.UPDATE_CARD, "correct store", "correct note", DateFormat.getDateInstance(DateFormat.LONG).format(validFromDate), DateFormat.getDateInstance(DateFormat.LONG).format(expiryDate), "100.00", currency.getSymbol(), "12345678", "87654321", CatimaBarcode.fromBarcode(BarcodeFormat.QR_CODE).prettyName(), frontBitmap, backBitmap);
+            checkAllFields(activity, newCard ? ViewMode.ADD_CARD : ViewMode.UPDATE_CARD, "correct store", "correct note", DateFormat.getDateInstance(DateFormat.LONG).format(validFromDate), DateFormat.getDateInstance(DateFormat.LONG).format(expiryDate), "100.00", currency.getSymbol(), "12345678", "87654321", CatimaBarcode.fromBarcode(BarcodeFormat.QR_CODE).prettyName(), StandardCharsets.ISO_8859_1.name(), frontBitmap, backBitmap);
 
             // Rotate to portrait
             shadowOf(getMainLooper()).idle();
@@ -457,7 +474,7 @@ public class LoyaltyCardViewActivityTest {
             activity.setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_PORTRAIT);
 
             // Check if no changes lost
-            checkAllFields(activity, newCard ? ViewMode.ADD_CARD : ViewMode.UPDATE_CARD, "correct store", "correct note", DateFormat.getDateInstance(DateFormat.LONG).format(validFromDate), DateFormat.getDateInstance(DateFormat.LONG).format(expiryDate), "100.00", currency.getSymbol(), "12345678", "87654321", CatimaBarcode.fromBarcode(BarcodeFormat.QR_CODE).prettyName(), frontBitmap, backBitmap);
+            checkAllFields(activity, newCard ? ViewMode.ADD_CARD : ViewMode.UPDATE_CARD, "correct store", "correct note", DateFormat.getDateInstance(DateFormat.LONG).format(validFromDate), DateFormat.getDateInstance(DateFormat.LONG).format(expiryDate), "100.00", currency.getSymbol(), "12345678", "87654321", CatimaBarcode.fromBarcode(BarcodeFormat.QR_CODE).prettyName(), StandardCharsets.ISO_8859_1.name(), frontBitmap, backBitmap);
         }
     }
 
@@ -471,7 +488,7 @@ public class LoyaltyCardViewActivityTest {
         Activity activity = (Activity) activityController.get();
         final Context context = activity.getApplicationContext();
 
-        checkAllFields(activity, ViewMode.ADD_CARD, "", "", context.getString(R.string.anyDate), context.getString(R.string.never), "0", context.getString(R.string.points), "", context.getString(R.string.sameAsCardId), context.getString(R.string.noBarcode), null, null);
+        checkAllFields(activity, ViewMode.ADD_CARD, "", "", context.getString(R.string.anyDate), context.getString(R.string.never), "0", context.getString(R.string.points), "", context.getString(R.string.sameAsCardId), context.getString(R.string.noBarcode), context.getString(R.string.automatic), null, null);
     }
 
     @Test
@@ -531,18 +548,18 @@ public class LoyaltyCardViewActivityTest {
         Activity activity = (Activity) activityController.get();
         final Context context = activity.getApplicationContext();
 
-        checkAllFields(activity, ViewMode.ADD_CARD, "", "", context.getString(R.string.anyDate), context.getString(R.string.never), "0", context.getString(R.string.points), "", context.getString(R.string.sameAsCardId), context.getString(R.string.noBarcode), null, null);
+        checkAllFields(activity, ViewMode.ADD_CARD, "", "", context.getString(R.string.anyDate), context.getString(R.string.never), "0", context.getString(R.string.points), "", context.getString(R.string.sameAsCardId), context.getString(R.string.noBarcode), context.getString(R.string.automatic), null, null);
 
         // Complete barcode capture successfully
         captureBarcodeWithResult(activity, true);
         activityController.resume();
 
-        checkAllFields(activity, ViewMode.ADD_CARD, "", "", context.getString(R.string.anyDate), context.getString(R.string.never), "0", context.getString(R.string.points), BARCODE_DATA, context.getString(R.string.sameAsCardId), BARCODE_TYPE.prettyName(), null, null);
+        checkAllFields(activity, ViewMode.ADD_CARD, "", "", context.getString(R.string.anyDate), context.getString(R.string.never), "0", context.getString(R.string.points), BARCODE_DATA, context.getString(R.string.sameAsCardId), BARCODE_TYPE.prettyName(), context.getString(R.string.automatic), null, null);
 
         shadowOf(getMainLooper()).idle();
 
         // Save and check the loyalty card
-        saveLoyaltyCardWithArguments(activity, "store", "note", context.getString(R.string.anyDate), context.getString(R.string.never), new BigDecimal("0"), context.getString(R.string.points), BARCODE_DATA, context.getString(R.string.sameAsCardId), BARCODE_TYPE.name(), true);
+        saveLoyaltyCardWithArguments(activity, "store", "note", context.getString(R.string.anyDate), context.getString(R.string.never), new BigDecimal("0"), context.getString(R.string.points), BARCODE_DATA, context.getString(R.string.sameAsCardId), BARCODE_TYPE.name(), context.getString(R.string.automatic), true);
     }
 
     @Test
@@ -555,7 +572,7 @@ public class LoyaltyCardViewActivityTest {
         Activity activity = (Activity) activityController.get();
         final Context context = activity.getApplicationContext();
 
-        checkAllFields(activity, ViewMode.ADD_CARD, "", "", context.getString(R.string.anyDate), context.getString(R.string.never), "0", context.getString(R.string.points), "", context.getString(R.string.sameAsCardId), context.getString(R.string.noBarcode), null, null);
+        checkAllFields(activity, ViewMode.ADD_CARD, "", "", context.getString(R.string.anyDate), context.getString(R.string.never), "0", context.getString(R.string.points), "", context.getString(R.string.sameAsCardId), context.getString(R.string.noBarcode), context.getString(R.string.automatic), null, null);
 
         // Complete barcode capture in failure
         captureBarcodeWithResult(activity, false);
@@ -563,7 +580,7 @@ public class LoyaltyCardViewActivityTest {
 
         shadowOf(getMainLooper()).idle();
 
-        checkAllFields(activity, ViewMode.ADD_CARD, "", "", context.getString(R.string.anyDate), context.getString(R.string.never), "0", context.getString(R.string.points), "", context.getString(R.string.sameAsCardId), context.getString(R.string.noBarcode), null, null);
+        checkAllFields(activity, ViewMode.ADD_CARD, "", "", context.getString(R.string.anyDate), context.getString(R.string.never), "0", context.getString(R.string.points), "", context.getString(R.string.sameAsCardId), context.getString(R.string.noBarcode), context.getString(R.string.automatic), null, null);
     }
 
     @Test
@@ -576,13 +593,13 @@ public class LoyaltyCardViewActivityTest {
         LoyaltyCardEditActivity activity = (LoyaltyCardEditActivity) activityController.get();
         final Context context = activity.getApplicationContext();
 
-        checkAllFields(activity, ViewMode.ADD_CARD, "", "", context.getString(R.string.anyDate), context.getString(R.string.never), "0", context.getString(R.string.points), "", context.getString(R.string.sameAsCardId), context.getString(R.string.noBarcode), null, null);
+        checkAllFields(activity, ViewMode.ADD_CARD, "", "", context.getString(R.string.anyDate), context.getString(R.string.never), "0", context.getString(R.string.points), "", context.getString(R.string.sameAsCardId), context.getString(R.string.noBarcode), context.getString(R.string.automatic), null, null);
 
         // Complete barcode capture successfully
         captureBarcodeWithResult(activity, true);
         activityController.resume();
 
-        checkAllFields(activity, ViewMode.ADD_CARD, "", "", context.getString(R.string.anyDate), context.getString(R.string.never), "0", context.getString(R.string.points), BARCODE_DATA, context.getString(R.string.sameAsCardId), BARCODE_TYPE.prettyName(), null, null);
+        checkAllFields(activity, ViewMode.ADD_CARD, "", "", context.getString(R.string.anyDate), context.getString(R.string.never), "0", context.getString(R.string.points), BARCODE_DATA, context.getString(R.string.sameAsCardId), BARCODE_TYPE.prettyName(), context.getString(R.string.automatic), null, null);
 
         // Cancel the loyalty card creation
         assertEquals(false, activity.isFinishing());
@@ -627,17 +644,16 @@ public class LoyaltyCardViewActivityTest {
         final Context context = ApplicationProvider.getApplicationContext();
         SQLiteDatabase database = TestHelpers.getEmptyDb(context).getWritableDatabase();
 
-        long cardId = DBHelper.insertLoyaltyCard(database, "store", "note", null, null, new BigDecimal("0"), null, BARCODE_DATA, null, BARCODE_TYPE, Color.BLACK, 0, null, 0);
+        long cardId = DBHelper.insertLoyaltyCard(database, "store", "note", null, null, new BigDecimal("0"), null, BARCODE_DATA, null, BARCODE_TYPE, null, Color.BLACK, 0, null, 0);
 
         ActivityController activityController = createActivityWithLoyaltyCard(true, (int) cardId);
         Activity activity = (Activity) activityController.get();
 
-
         activityController.start();
         activityController.visible();
         activityController.resume();
 
-        checkAllFields(activity, ViewMode.UPDATE_CARD, "store", "note", context.getString(R.string.anyDate), context.getString(R.string.never), "0", context.getString(R.string.points), BARCODE_DATA, context.getString(R.string.sameAsCardId), BARCODE_TYPE.prettyName(), null, null);
+        checkAllFields(activity, ViewMode.UPDATE_CARD, "store", "note", context.getString(R.string.anyDate), context.getString(R.string.never), "0", context.getString(R.string.points), BARCODE_DATA, context.getString(R.string.sameAsCardId), BARCODE_TYPE.prettyName(), context.getString(R.string.automatic), null, null);
 
         database.close();
     }
@@ -647,7 +663,7 @@ public class LoyaltyCardViewActivityTest {
         final Context context = ApplicationProvider.getApplicationContext();
         SQLiteDatabase database = TestHelpers.getEmptyDb(context).getWritableDatabase();
 
-        long cardId = DBHelper.insertLoyaltyCard(database, "store", "note", null, null, new BigDecimal("0"), null, BARCODE_DATA, null, BARCODE_TYPE, Color.BLACK, 0, null, 0);
+        long cardId = DBHelper.insertLoyaltyCard(database, "store", "note", null, null, new BigDecimal("0"), null, BARCODE_DATA, null, BARCODE_TYPE, StandardCharsets.UTF_8, Color.BLACK, 0, null, 0);
 
         ActivityController activityController = createActivityWithLoyaltyCard(false, (int) cardId);
         Activity activity = (Activity) activityController.get();
@@ -656,7 +672,7 @@ public class LoyaltyCardViewActivityTest {
         activityController.visible();
         activityController.resume();
 
-        checkAllFields(activity, ViewMode.VIEW_CARD, "store", "note", null, null, "0", context.getString(R.string.points), BARCODE_DATA, null, BARCODE_TYPE.toString(), null, null);
+        checkAllFields(activity, ViewMode.VIEW_CARD, "store", "note", null, null, "0", context.getString(R.string.points), BARCODE_DATA, null, BARCODE_TYPE.toString(), StandardCharsets.UTF_8.name(), null, null);
 
         database.close();
     }
@@ -666,7 +682,7 @@ public class LoyaltyCardViewActivityTest {
         final Context context = ApplicationProvider.getApplicationContext();
         SQLiteDatabase database = TestHelpers.getEmptyDb(context).getWritableDatabase();
 
-        long cardId = DBHelper.insertLoyaltyCard(database, "store", "note", null, null, new BigDecimal("0"), null, EAN_BARCODE_DATA, null, EAN_BARCODE_TYPE, Color.BLACK, 0, null, 0);
+        long cardId = DBHelper.insertLoyaltyCard(database, "store", "note", null, null, new BigDecimal("0"), null, EAN_BARCODE_DATA, null, EAN_BARCODE_TYPE, StandardCharsets.UTF_8, Color.BLACK, 0, null, 0);
 
         ActivityController activityController = createActivityWithLoyaltyCard(true, (int) cardId);
         Activity activity = (Activity) activityController.get();
@@ -675,13 +691,13 @@ public class LoyaltyCardViewActivityTest {
         activityController.visible();
         activityController.resume();
 
-        checkAllFields(activity, ViewMode.UPDATE_CARD, "store", "note", context.getString(R.string.anyDate), context.getString(R.string.never), "0", context.getString(R.string.points), EAN_BARCODE_DATA, context.getString(R.string.sameAsCardId), EAN_BARCODE_TYPE.prettyName(), null, null);
+        checkAllFields(activity, ViewMode.UPDATE_CARD, "store", "note", context.getString(R.string.anyDate), context.getString(R.string.never), "0", context.getString(R.string.points), EAN_BARCODE_DATA, context.getString(R.string.sameAsCardId), EAN_BARCODE_TYPE.prettyName(), StandardCharsets.UTF_8.name(), null, null);
 
         // Complete barcode capture successfully
         captureBarcodeWithResult(activity, true);
         activityController.resume();
 
-        checkAllFields(activity, ViewMode.UPDATE_CARD, "store", "note", context.getString(R.string.anyDate), context.getString(R.string.never), "0", context.getString(R.string.points), BARCODE_DATA, context.getString(R.string.sameAsCardId), BARCODE_TYPE.prettyName(), null, null);
+        checkAllFields(activity, ViewMode.UPDATE_CARD, "store", "note", context.getString(R.string.anyDate), context.getString(R.string.never), "0", context.getString(R.string.points), BARCODE_DATA, context.getString(R.string.sameAsCardId), BARCODE_TYPE.prettyName(), StandardCharsets.UTF_8.name(), null, null);
 
         database.close();
     }
@@ -691,7 +707,7 @@ public class LoyaltyCardViewActivityTest {
         final Context context = ApplicationProvider.getApplicationContext();
         SQLiteDatabase database = TestHelpers.getEmptyDb(context).getWritableDatabase();
 
-        long cardId = DBHelper.insertLoyaltyCard(database, "store", "note", null, null, new BigDecimal("0"), null, EAN_BARCODE_DATA, null, EAN_BARCODE_TYPE, Color.BLACK, 0, null, 0);
+        long cardId = DBHelper.insertLoyaltyCard(database, "store", "note", null, null, new BigDecimal("0"), null, EAN_BARCODE_DATA, null, EAN_BARCODE_TYPE, null, Color.BLACK, 0, null, 0);
 
         ActivityController activityController = createActivityWithLoyaltyCard(true, (int) cardId);
         LoyaltyCardEditActivity activity = (LoyaltyCardEditActivity) activityController.get();
@@ -700,13 +716,13 @@ public class LoyaltyCardViewActivityTest {
         activityController.visible();
         activityController.resume();
 
-        checkAllFields(activity, ViewMode.UPDATE_CARD, "store", "note", context.getString(R.string.anyDate), context.getString(R.string.never), "0", context.getString(R.string.points), EAN_BARCODE_DATA, context.getString(R.string.sameAsCardId), EAN_BARCODE_TYPE.prettyName(), null, null);
+        checkAllFields(activity, ViewMode.UPDATE_CARD, "store", "note", context.getString(R.string.anyDate), context.getString(R.string.never), "0", context.getString(R.string.points), EAN_BARCODE_DATA, context.getString(R.string.sameAsCardId), EAN_BARCODE_TYPE.prettyName(), context.getString(R.string.automatic), null, null);
 
         // Complete barcode capture successfully
         captureBarcodeWithResult(activity, true);
         activityController.resume();
 
-        checkAllFields(activity, ViewMode.UPDATE_CARD, "store", "note", context.getString(R.string.anyDate), context.getString(R.string.never), "0", context.getString(R.string.points), BARCODE_DATA, context.getString(R.string.sameAsCardId), BARCODE_TYPE.prettyName(), null, null);
+        checkAllFields(activity, ViewMode.UPDATE_CARD, "store", "note", context.getString(R.string.anyDate), context.getString(R.string.never), "0", context.getString(R.string.points), BARCODE_DATA, context.getString(R.string.sameAsCardId), BARCODE_TYPE.prettyName(), context.getString(R.string.automatic), null, null);
 
         // Cancel the loyalty card creation
         assertEquals(false, activity.isFinishing());
@@ -730,7 +746,7 @@ public class LoyaltyCardViewActivityTest {
         final Context context = ApplicationProvider.getApplicationContext();
         SQLiteDatabase database = TestHelpers.getEmptyDb(context).getWritableDatabase();
 
-        long cardId = DBHelper.insertLoyaltyCard(database, "store", "note", null, null, new BigDecimal("0"), null, EAN_BARCODE_DATA, null, EAN_BARCODE_TYPE, Color.BLACK, 0, null, 0);
+        long cardId = DBHelper.insertLoyaltyCard(database, "store", "note", null, null, new BigDecimal("0"), null, EAN_BARCODE_DATA, null, EAN_BARCODE_TYPE, null, Color.BLACK, 0, null, 0);
 
         ActivityController activityController = createActivityWithLoyaltyCard(true, (int) cardId);
         Activity activity = (Activity) activityController.get();
@@ -739,7 +755,7 @@ public class LoyaltyCardViewActivityTest {
         activityController.visible();
         activityController.resume();
 
-        checkAllFields(activity, ViewMode.UPDATE_CARD, "store", "note", context.getString(R.string.anyDate), context.getString(R.string.never), "0", context.getString(R.string.points), EAN_BARCODE_DATA, context.getString(R.string.sameAsCardId), EAN_BARCODE_TYPE.prettyName(), null, null);
+        checkAllFields(activity, ViewMode.UPDATE_CARD, "store", "note", context.getString(R.string.anyDate), context.getString(R.string.never), "0", context.getString(R.string.points), EAN_BARCODE_DATA, context.getString(R.string.sameAsCardId), EAN_BARCODE_TYPE.prettyName(), context.getString(R.string.automatic), null, null);
 
         // Set date to today
         MaterialAutoCompleteTextView expiryField = activity.findViewById(R.id.expiryField);
@@ -753,7 +769,7 @@ public class LoyaltyCardViewActivityTest {
 
         shadowOf(getMainLooper()).idle();
 
-        checkAllFields(activity, ViewMode.UPDATE_CARD, "store", "note", context.getString(R.string.anyDate), DateFormat.getDateInstance(DateFormat.LONG).format(new Date()), "0", context.getString(R.string.points), EAN_BARCODE_DATA, context.getString(R.string.sameAsCardId), EAN_BARCODE_TYPE.prettyName(), null, null);
+        checkAllFields(activity, ViewMode.UPDATE_CARD, "store", "note", context.getString(R.string.anyDate), DateFormat.getDateInstance(DateFormat.LONG).format(new Date()), "0", context.getString(R.string.points), EAN_BARCODE_DATA, context.getString(R.string.sameAsCardId), EAN_BARCODE_TYPE.prettyName(), context.getString(R.string.automatic), null, null);
 
         database.close();
     }
@@ -763,7 +779,7 @@ public class LoyaltyCardViewActivityTest {
         final Context context = ApplicationProvider.getApplicationContext();
         SQLiteDatabase database = TestHelpers.getEmptyDb(context).getWritableDatabase();
 
-        long cardId = DBHelper.insertLoyaltyCard(database, "store", "note", null, new Date(), new BigDecimal("0"), null, EAN_BARCODE_DATA, null, EAN_BARCODE_TYPE, Color.BLACK, 0, null, 0);
+        long cardId = DBHelper.insertLoyaltyCard(database, "store", "note", null, new Date(), new BigDecimal("0"), null, EAN_BARCODE_DATA, null, EAN_BARCODE_TYPE, null, Color.BLACK, 0, null, 0);
 
         ActivityController activityController = createActivityWithLoyaltyCard(true, (int) cardId);
         Activity activity = (Activity) activityController.get();
@@ -772,13 +788,13 @@ public class LoyaltyCardViewActivityTest {
         activityController.visible();
         activityController.resume();
 
-        checkAllFields(activity, ViewMode.UPDATE_CARD, "store", "note", context.getString(R.string.anyDate), DateFormat.getDateInstance(DateFormat.LONG).format(new Date()), "0", context.getString(R.string.points), EAN_BARCODE_DATA, context.getString(R.string.sameAsCardId), EAN_BARCODE_TYPE.prettyName(), null, null);
+        checkAllFields(activity, ViewMode.UPDATE_CARD, "store", "note", context.getString(R.string.anyDate), DateFormat.getDateInstance(DateFormat.LONG).format(new Date()), "0", context.getString(R.string.points), EAN_BARCODE_DATA, context.getString(R.string.sameAsCardId), EAN_BARCODE_TYPE.prettyName(), context.getString(R.string.automatic), null, null);
 
         // Set date to never
         MaterialAutoCompleteTextView expiryField = activity.findViewById(R.id.expiryField);
         expiryField.setText(expiryField.getAdapter().getItem(0).toString(), false);
 
-        checkAllFields(activity, ViewMode.UPDATE_CARD, "store", "note", context.getString(R.string.anyDate), context.getString(R.string.never), "0", context.getString(R.string.points), EAN_BARCODE_DATA, context.getString(R.string.sameAsCardId), EAN_BARCODE_TYPE.prettyName(), null, null);
+        checkAllFields(activity, ViewMode.UPDATE_CARD, "store", "note", context.getString(R.string.anyDate), context.getString(R.string.never), "0", context.getString(R.string.points), EAN_BARCODE_DATA, context.getString(R.string.sameAsCardId), EAN_BARCODE_TYPE.prettyName(), context.getString(R.string.automatic), null, null);
 
         database.close();
     }
@@ -788,7 +804,7 @@ public class LoyaltyCardViewActivityTest {
         final Context context = ApplicationProvider.getApplicationContext();
         SQLiteDatabase database = TestHelpers.getEmptyDb(context).getWritableDatabase();
 
-        long cardId = DBHelper.insertLoyaltyCard(database, "store", "note", null, null, new BigDecimal("0"), null, EAN_BARCODE_DATA, null, EAN_BARCODE_TYPE, Color.BLACK, 0, null, 0);
+        long cardId = DBHelper.insertLoyaltyCard(database, "store", "note", null, null, new BigDecimal("0"), null, EAN_BARCODE_DATA, null, EAN_BARCODE_TYPE, null, Color.BLACK, 0, null, 0);
 
         ActivityController activityController = createActivityWithLoyaltyCard(true, (int) cardId);
         Activity activity = (Activity) activityController.get();
@@ -797,7 +813,7 @@ public class LoyaltyCardViewActivityTest {
         activityController.visible();
         activityController.resume();
 
-        checkAllFields(activity, ViewMode.UPDATE_CARD, "store", "note", context.getString(R.string.anyDate), context.getString(R.string.never), "0", context.getString(R.string.points), EAN_BARCODE_DATA, context.getString(R.string.sameAsCardId), EAN_BARCODE_TYPE.prettyName(), null, null);
+        checkAllFields(activity, ViewMode.UPDATE_CARD, "store", "note", context.getString(R.string.anyDate), context.getString(R.string.never), "0", context.getString(R.string.points), EAN_BARCODE_DATA, context.getString(R.string.sameAsCardId), EAN_BARCODE_TYPE.prettyName(), context.getString(R.string.automatic), null, null);
 
         // Set balance to 10 points
         EditText balanceField = activity.findViewById(R.id.balanceField);
@@ -826,7 +842,7 @@ public class LoyaltyCardViewActivityTest {
 
                 shadowOf(getMainLooper()).idle();
 
-                checkAllFields(activity, ViewMode.UPDATE_CARD, "store", "note", DateFormat.getDateInstance(DateFormat.LONG).format(new Date()), DateFormat.getDateInstance(DateFormat.LONG).format(new Date()), "10.00", "€", EAN_BARCODE_DATA, null, EAN_BARCODE_TYPE.toString(), null, null);
+                checkAllFields(activity, ViewMode.UPDATE_CARD, "store", "note", DateFormat.getDateInstance(DateFormat.LONG).format(new Date()), DateFormat.getDateInstance(DateFormat.LONG).format(new Date()), "10.00", "€", EAN_BARCODE_DATA, null, EAN_BARCODE_TYPE.toString(), context.getString(R.string.automatic), null, null);
 
                 database.close();
             }
@@ -839,7 +855,7 @@ public class LoyaltyCardViewActivityTest {
         final Context context = ApplicationProvider.getApplicationContext();
         SQLiteDatabase database = TestHelpers.getEmptyDb(context).getWritableDatabase();
 
-        long cardId = DBHelper.insertLoyaltyCard(database, "store", "note", null, null, new BigDecimal("10.00"), Currency.getInstance("USD"), EAN_BARCODE_DATA, null, EAN_BARCODE_TYPE, Color.BLACK, 0, null, 0);
+        long cardId = DBHelper.insertLoyaltyCard(database, "store", "note", null, null, new BigDecimal("10.00"), Currency.getInstance("USD"), EAN_BARCODE_DATA, null, EAN_BARCODE_TYPE, null, Color.BLACK, 0, null, 0);
 
         ActivityController activityController = createActivityWithLoyaltyCard(true, (int) cardId);
         Activity activity = (Activity) activityController.get();
@@ -848,7 +864,7 @@ public class LoyaltyCardViewActivityTest {
         activityController.visible();
         activityController.resume();
 
-        checkAllFields(activity, ViewMode.UPDATE_CARD, "store", "note", context.getString(R.string.anyDate), context.getString(R.string.never), "10.00", "$", EAN_BARCODE_DATA, context.getString(R.string.sameAsCardId), EAN_BARCODE_TYPE.prettyName(), null, null);
+        checkAllFields(activity, ViewMode.UPDATE_CARD, "store", "note", context.getString(R.string.anyDate), context.getString(R.string.never), "10.00", "$", EAN_BARCODE_DATA, context.getString(R.string.sameAsCardId), EAN_BARCODE_TYPE.prettyName(), context.getString(R.string.automatic), null, null);
 
         shadowOf(getMainLooper()).idle();
 
@@ -870,7 +886,7 @@ public class LoyaltyCardViewActivityTest {
 
         shadowOf(getMainLooper()).idle();
 
-        checkAllFields(activity, ViewMode.UPDATE_CARD, "store", "note", context.getString(R.string.anyDate), context.getString(R.string.never), "0", "₩", EAN_BARCODE_DATA, context.getString(R.string.sameAsCardId), EAN_BARCODE_TYPE.prettyName(), null, null);
+        checkAllFields(activity, ViewMode.UPDATE_CARD, "store", "note", context.getString(R.string.anyDate), context.getString(R.string.never), "0", "₩", EAN_BARCODE_DATA, context.getString(R.string.sameAsCardId), EAN_BARCODE_TYPE.prettyName(), context.getString(R.string.automatic), null, null);
 
         database.close();
     }
@@ -880,7 +896,7 @@ public class LoyaltyCardViewActivityTest {
         final Context context = ApplicationProvider.getApplicationContext();
         SQLiteDatabase database = TestHelpers.getEmptyDb(context).getWritableDatabase();
 
-        long cardId = DBHelper.insertLoyaltyCard(database, "store", "note", null, null, new BigDecimal("0"), null, EAN_BARCODE_DATA, null, EAN_BARCODE_TYPE, Color.BLACK, 0, null, 0);
+        long cardId = DBHelper.insertLoyaltyCard(database, "store", "note", null, null, new BigDecimal("0"), null, EAN_BARCODE_DATA, null, EAN_BARCODE_TYPE, null, Color.BLACK, 0, null, 0);
 
         ActivityController activityController = createActivityWithLoyaltyCard(true, (int) cardId);
         Activity activity = (Activity) activityController.get();
@@ -889,7 +905,7 @@ public class LoyaltyCardViewActivityTest {
         activityController.visible();
         activityController.resume();
 
-        checkAllFields(activity, ViewMode.UPDATE_CARD, "store", "note", context.getString(R.string.anyDate), context.getString(R.string.never), "0", context.getString(R.string.points), EAN_BARCODE_DATA, context.getString(R.string.sameAsCardId), EAN_BARCODE_TYPE.prettyName(), null, null);
+        checkAllFields(activity, ViewMode.UPDATE_CARD, "store", "note", context.getString(R.string.anyDate), context.getString(R.string.never), "0", context.getString(R.string.points), EAN_BARCODE_DATA, context.getString(R.string.sameAsCardId), EAN_BARCODE_TYPE.prettyName(), context.getString(R.string.automatic), null, null);
 
         // Change barcode ID
         EditText barcodeField = activity.findViewById(R.id.barcodeIdField);
@@ -902,7 +918,7 @@ public class LoyaltyCardViewActivityTest {
         AlertDialog updateBarcodeIdDialog = (AlertDialog) (ShadowDialog.getLatestDialog());
         assertNull(updateBarcodeIdDialog);
 
-        checkAllFields(activity, ViewMode.UPDATE_CARD, "store", "note", context.getString(R.string.anyDate), context.getString(R.string.never), "0", context.getString(R.string.points), EAN_BARCODE_DATA, "123456", EAN_BARCODE_TYPE.prettyName(), null, null);
+        checkAllFields(activity, ViewMode.UPDATE_CARD, "store", "note", context.getString(R.string.anyDate), context.getString(R.string.never), "0", context.getString(R.string.points), EAN_BARCODE_DATA, "123456", EAN_BARCODE_TYPE.prettyName(), context.getString(R.string.automatic), null, null);
 
         database.close();
     }
@@ -912,7 +928,7 @@ public class LoyaltyCardViewActivityTest {
         final Context context = ApplicationProvider.getApplicationContext();
         SQLiteDatabase database = TestHelpers.getEmptyDb(context).getWritableDatabase();
 
-        long cardId = DBHelper.insertLoyaltyCard(database, "store", "note", null, null, new BigDecimal("0"), null, EAN_BARCODE_DATA, null, EAN_BARCODE_TYPE, Color.BLACK, 0, null, 0);
+        long cardId = DBHelper.insertLoyaltyCard(database, "store", "note", null, null, new BigDecimal("0"), null, EAN_BARCODE_DATA, null, EAN_BARCODE_TYPE, null, Color.BLACK, 0, null, 0);
 
         ActivityController activityController = createActivityWithLoyaltyCard(true, (int) cardId);
         Activity activity = (Activity) activityController.get();
@@ -921,7 +937,7 @@ public class LoyaltyCardViewActivityTest {
         activityController.visible();
         activityController.resume();
 
-        checkAllFields(activity, ViewMode.UPDATE_CARD, "store", "note", context.getString(R.string.anyDate), context.getString(R.string.never), "0", context.getString(R.string.points), EAN_BARCODE_DATA, context.getString(R.string.sameAsCardId), EAN_BARCODE_TYPE.prettyName(), null, null);
+        checkAllFields(activity, ViewMode.UPDATE_CARD, "store", "note", context.getString(R.string.anyDate), context.getString(R.string.never), "0", context.getString(R.string.points), EAN_BARCODE_DATA, context.getString(R.string.sameAsCardId), EAN_BARCODE_TYPE.prettyName(), context.getString(R.string.automatic), null, null);
 
         // Change card ID
         EditText cardIdField = activity.findViewById(R.id.cardIdView);
@@ -936,7 +952,7 @@ public class LoyaltyCardViewActivityTest {
 
         shadowOf(getMainLooper()).idle();
 
-        checkAllFields(activity, ViewMode.UPDATE_CARD, "store", "note", context.getString(R.string.anyDate), context.getString(R.string.never), "0", context.getString(R.string.points), "123456", context.getString(R.string.sameAsCardId), EAN_BARCODE_TYPE.prettyName(), null, null);
+        checkAllFields(activity, ViewMode.UPDATE_CARD, "store", "note", context.getString(R.string.anyDate), context.getString(R.string.never), "0", context.getString(R.string.points), "123456", context.getString(R.string.sameAsCardId), EAN_BARCODE_TYPE.prettyName(), context.getString(R.string.automatic), null, null);
 
         database.close();
     }
@@ -946,7 +962,7 @@ public class LoyaltyCardViewActivityTest {
         final Context context = ApplicationProvider.getApplicationContext();
         SQLiteDatabase database = TestHelpers.getEmptyDb(context).getWritableDatabase();
 
-        long cardId = DBHelper.insertLoyaltyCard(database, "store", "note", null, null, new BigDecimal("0"), null, EAN_BARCODE_DATA, "123456", EAN_BARCODE_TYPE, Color.BLACK, 0, null, 0);
+        long cardId = DBHelper.insertLoyaltyCard(database, "store", "note", null, null, new BigDecimal("0"), null, EAN_BARCODE_DATA, "123456", EAN_BARCODE_TYPE, null, Color.BLACK, 0, null, 0);
 
         ActivityController activityController = createActivityWithLoyaltyCard(true, (int) cardId);
         Activity activity = (Activity) activityController.get();
@@ -955,7 +971,7 @@ public class LoyaltyCardViewActivityTest {
         activityController.visible();
         activityController.resume();
 
-        checkAllFields(activity, ViewMode.UPDATE_CARD, "store", "note", context.getString(R.string.anyDate), context.getString(R.string.never), "0", context.getString(R.string.points), EAN_BARCODE_DATA, "123456", EAN_BARCODE_TYPE.prettyName(), null, null);
+        checkAllFields(activity, ViewMode.UPDATE_CARD, "store", "note", context.getString(R.string.anyDate), context.getString(R.string.never), "0", context.getString(R.string.points), EAN_BARCODE_DATA, "123456", EAN_BARCODE_TYPE.prettyName(), context.getString(R.string.automatic), null, null);
 
         // Change card ID
         EditText cardIdField = activity.findViewById(R.id.cardIdView);
@@ -973,7 +989,7 @@ public class LoyaltyCardViewActivityTest {
 
         shadowOf(getMainLooper()).idle();
 
-        checkAllFields(activity, ViewMode.UPDATE_CARD, "store", "note", context.getString(R.string.anyDate), context.getString(R.string.never), "0", context.getString(R.string.points), "654321", context.getString(R.string.sameAsCardId), EAN_BARCODE_TYPE.prettyName(), null, null);
+        checkAllFields(activity, ViewMode.UPDATE_CARD, "store", "note", context.getString(R.string.anyDate), context.getString(R.string.never), "0", context.getString(R.string.points), "654321", context.getString(R.string.sameAsCardId), EAN_BARCODE_TYPE.prettyName(), context.getString(R.string.automatic), null, null);
 
         database.close();
     }
@@ -983,7 +999,7 @@ public class LoyaltyCardViewActivityTest {
         final Context context = ApplicationProvider.getApplicationContext();
         SQLiteDatabase database = TestHelpers.getEmptyDb(context).getWritableDatabase();
 
-        long cardId = DBHelper.insertLoyaltyCard(database, "store", "note", null, null, new BigDecimal("0"), null, EAN_BARCODE_DATA, "123456", EAN_BARCODE_TYPE, Color.BLACK, 0, null, 0);
+        long cardId = DBHelper.insertLoyaltyCard(database, "store", "note", null, null, new BigDecimal("0"), null, EAN_BARCODE_DATA, "123456", EAN_BARCODE_TYPE, null, Color.BLACK, 0, null, 0);
 
         ActivityController activityController = createActivityWithLoyaltyCard(true, (int) cardId);
         Activity activity = (Activity) activityController.get();
@@ -992,7 +1008,7 @@ public class LoyaltyCardViewActivityTest {
         activityController.visible();
         activityController.resume();
 
-        checkAllFields(activity, ViewMode.UPDATE_CARD, "store", "note", context.getString(R.string.anyDate), context.getString(R.string.never), "0", context.getString(R.string.points), EAN_BARCODE_DATA, "123456", EAN_BARCODE_TYPE.prettyName(), null, null);
+        checkAllFields(activity, ViewMode.UPDATE_CARD, "store", "note", context.getString(R.string.anyDate), context.getString(R.string.never), "0", context.getString(R.string.points), EAN_BARCODE_DATA, "123456", EAN_BARCODE_TYPE.prettyName(), context.getString(R.string.automatic), null, null);
 
         // Change card ID
         EditText cardIdField = activity.findViewById(R.id.cardIdView);
@@ -1010,7 +1026,7 @@ public class LoyaltyCardViewActivityTest {
 
         shadowOf(getMainLooper()).idle();
 
-        checkAllFields(activity, ViewMode.UPDATE_CARD, "store", "note", context.getString(R.string.anyDate), context.getString(R.string.never), "0", context.getString(R.string.points), "654321", "123456", EAN_BARCODE_TYPE.prettyName(), null, null);
+        checkAllFields(activity, ViewMode.UPDATE_CARD, "store", "note", context.getString(R.string.anyDate), context.getString(R.string.never), "0", context.getString(R.string.points), "654321", "123456", EAN_BARCODE_TYPE.prettyName(), context.getString(R.string.automatic), null, null);
 
         database.close();
     }
@@ -1020,7 +1036,7 @@ public class LoyaltyCardViewActivityTest {
         final Context context = ApplicationProvider.getApplicationContext();
         SQLiteDatabase database = TestHelpers.getEmptyDb(context).getWritableDatabase();
 
-        long cardId = DBHelper.insertLoyaltyCard(database, "store", "note", null, null, new BigDecimal("0"), null, BARCODE_DATA, null, BARCODE_TYPE, Color.BLACK, 0, null, 0);
+        long cardId = DBHelper.insertLoyaltyCard(database, "store", "note", null, null, new BigDecimal("0"), null, BARCODE_DATA, null, BARCODE_TYPE, null, Color.BLACK, 0, null, 0);
 
         ActivityController activityController = createActivityWithLoyaltyCard(false, (int) cardId);
         Activity activity = (Activity) activityController.get();
@@ -1065,7 +1081,7 @@ public class LoyaltyCardViewActivityTest {
         final Context context = ApplicationProvider.getApplicationContext();
         SQLiteDatabase database = TestHelpers.getEmptyDb(context).getWritableDatabase();
 
-        long cardId = DBHelper.insertLoyaltyCard(database, "store", "note", null, null, new BigDecimal("0"), null, BARCODE_DATA, null, BARCODE_TYPE, Color.BLACK, 0, null, 0);
+        long cardId = DBHelper.insertLoyaltyCard(database, "store", "note", null, null, new BigDecimal("0"), null, BARCODE_DATA, null, BARCODE_TYPE, null, Color.BLACK, 0, null, 0);
 
         ActivityController activityController = createActivityWithLoyaltyCard(false, (int) cardId);
         Activity activity = (Activity) activityController.get();
@@ -1086,7 +1102,7 @@ public class LoyaltyCardViewActivityTest {
         final Context context = ApplicationProvider.getApplicationContext();
         SQLiteDatabase database = TestHelpers.getEmptyDb(context).getWritableDatabase();
 
-        long cardId = DBHelper.insertLoyaltyCard(database, "store", "note", null, null, new BigDecimal("0"), null, BARCODE_DATA, null, BARCODE_TYPE, null, 0, null, 0);
+        long cardId = DBHelper.insertLoyaltyCard(database, "store", "note", null, null, new BigDecimal("0"), null, BARCODE_DATA, null, BARCODE_TYPE, null, null, 0, null, 0);
 
         ActivityController activityController = createActivityWithLoyaltyCard(false, (int) cardId);
         Activity activity = (Activity) activityController.get();
@@ -1107,7 +1123,7 @@ public class LoyaltyCardViewActivityTest {
         final Context context = ApplicationProvider.getApplicationContext();
         SQLiteDatabase database = TestHelpers.getEmptyDb(context).getWritableDatabase();
 
-        long cardId = DBHelper.insertLoyaltyCard(database, "store", "note", null, null, new BigDecimal("0"), null, BARCODE_DATA, null, BARCODE_TYPE, null, 0, null, 0);
+        long cardId = DBHelper.insertLoyaltyCard(database, "store", "note", null, null, new BigDecimal("0"), null, BARCODE_DATA, null, BARCODE_TYPE, null, null, 0, null, 0);
 
         ActivityController activityController = createActivityWithLoyaltyCard(true, (int) cardId);
         Activity activity = (Activity) activityController.get();
@@ -1117,7 +1133,7 @@ public class LoyaltyCardViewActivityTest {
         activityController.resume();
 
         // Save and check the loyalty card
-        saveLoyaltyCardWithArguments(activity, "store", "note", activity.getApplicationContext().getString(R.string.anyDate), activity.getApplicationContext().getString(R.string.never), new BigDecimal("0"), activity.getApplicationContext().getString(R.string.points), BARCODE_DATA, activity.getApplicationContext().getString(R.string.sameAsCardId), BARCODE_TYPE.name(), false);
+        saveLoyaltyCardWithArguments(activity, "store", "note", activity.getApplicationContext().getString(R.string.anyDate), activity.getApplicationContext().getString(R.string.never), new BigDecimal("0"), activity.getApplicationContext().getString(R.string.points), BARCODE_DATA, activity.getApplicationContext().getString(R.string.sameAsCardId), BARCODE_TYPE.name(), activity.getApplicationContext().getString(R.string.automatic), false);
 
         database.close();
     }
@@ -1127,7 +1143,7 @@ public class LoyaltyCardViewActivityTest {
         final Context context = ApplicationProvider.getApplicationContext();
         SQLiteDatabase database = TestHelpers.getEmptyDb(context).getWritableDatabase();
 
-        long cardId = DBHelper.insertLoyaltyCard(database, "store", "note", null, null, new BigDecimal("0"), null, BARCODE_DATA, null, null, Color.BLACK, 0, null, 0);
+        long cardId = DBHelper.insertLoyaltyCard(database, "store", "note", null, null, new BigDecimal("0"), null, BARCODE_DATA, null, null, null, Color.BLACK, 0, null, 0);
 
         ActivityController activityController = createActivityWithLoyaltyCard(true, (int) cardId);
         Activity activity = (Activity) activityController.get();
@@ -1137,7 +1153,7 @@ public class LoyaltyCardViewActivityTest {
         activityController.resume();
 
         // Save and check the loyalty card
-        saveLoyaltyCardWithArguments(activity, "store", "note", activity.getApplicationContext().getString(R.string.anyDate), activity.getApplicationContext().getString(R.string.never), new BigDecimal("0"), activity.getApplicationContext().getString(R.string.points), BARCODE_DATA, activity.getApplicationContext().getString(R.string.sameAsCardId), activity.getApplicationContext().getString(R.string.noBarcode), false);
+        saveLoyaltyCardWithArguments(activity, "store", "note", activity.getApplicationContext().getString(R.string.anyDate), activity.getApplicationContext().getString(R.string.never), new BigDecimal("0"), activity.getApplicationContext().getString(R.string.points), BARCODE_DATA, activity.getApplicationContext().getString(R.string.sameAsCardId), activity.getApplicationContext().getString(R.string.noBarcode), activity.getApplicationContext().getString(R.string.automatic), false);
 
         database.close();
     }
@@ -1147,7 +1163,7 @@ public class LoyaltyCardViewActivityTest {
         final Context context = ApplicationProvider.getApplicationContext();
         SQLiteDatabase database = TestHelpers.getEmptyDb(context).getWritableDatabase();
 
-        long cardId = DBHelper.insertLoyaltyCard(database, "store", "note", null, null, new BigDecimal("0"), null, BARCODE_DATA, null, BARCODE_TYPE, Color.BLACK, 0, null, 0);
+        long cardId = DBHelper.insertLoyaltyCard(database, "store", "note", null, null, new BigDecimal("0"), null, BARCODE_DATA, null, BARCODE_TYPE, null, Color.BLACK, 0, null, 0);
 
         ActivityController activityController = createActivityWithLoyaltyCard(true, (int) cardId);
         Activity activity = (Activity) activityController.get();
@@ -1157,18 +1173,18 @@ public class LoyaltyCardViewActivityTest {
         activityController.resume();
 
         // First check if the card is as expected
-        checkAllFields(activity, ViewMode.UPDATE_CARD, "store", "note", context.getString(R.string.anyDate), context.getString(R.string.never), "0", context.getString(R.string.points), BARCODE_DATA, context.getString(R.string.sameAsCardId), BARCODE_TYPE.prettyName(), null, null);
+        checkAllFields(activity, ViewMode.UPDATE_CARD, "store", "note", context.getString(R.string.anyDate), context.getString(R.string.never), "0", context.getString(R.string.points), BARCODE_DATA, context.getString(R.string.sameAsCardId), BARCODE_TYPE.prettyName(), context.getString(R.string.automatic), null, null);
 
         // Complete empty barcode selection successfully
         selectBarcodeWithResult(activity, BARCODE_DATA, null, true);
         activityController.resume();
 
         // Check if the barcode type is NO_BARCODE as expected
-        checkAllFields(activity, ViewMode.UPDATE_CARD, "store", "note", context.getString(R.string.anyDate), context.getString(R.string.never), "0", context.getString(R.string.points), BARCODE_DATA, context.getString(R.string.sameAsCardId), context.getString(R.string.noBarcode), null, null);
+        checkAllFields(activity, ViewMode.UPDATE_CARD, "store", "note", context.getString(R.string.anyDate), context.getString(R.string.never), "0", context.getString(R.string.points), BARCODE_DATA, context.getString(R.string.sameAsCardId), context.getString(R.string.noBarcode), context.getString(R.string.automatic), null, null);
         assertEquals(View.GONE, activity.findViewById(R.id.barcodeLayout).getVisibility());
 
         // Check if the special NO_BARCODE string doesn't get saved
-        saveLoyaltyCardWithArguments(activity, "store", "note", context.getString(R.string.anyDate), context.getString(R.string.never), new BigDecimal("0"), context.getString(R.string.points), BARCODE_DATA, context.getString(R.string.sameAsCardId), context.getString(R.string.noBarcode), false);
+        saveLoyaltyCardWithArguments(activity, "store", "note", context.getString(R.string.anyDate), context.getString(R.string.never), new BigDecimal("0"), context.getString(R.string.points), BARCODE_DATA, context.getString(R.string.sameAsCardId), context.getString(R.string.noBarcode), context.getString(R.string.automatic), false);
 
         database.close();
     }
@@ -1178,7 +1194,7 @@ public class LoyaltyCardViewActivityTest {
         final Context context = ApplicationProvider.getApplicationContext();
         SQLiteDatabase database = TestHelpers.getEmptyDb(context).getWritableDatabase();
 
-        long cardId = DBHelper.insertLoyaltyCard(database, "store", "note", null, null, new BigDecimal("0"), null, BARCODE_DATA, null, BARCODE_TYPE, Color.BLACK, 0, null, 0);
+        long cardId = DBHelper.insertLoyaltyCard(database, "store", "note", null, null, new BigDecimal("0"), null, BARCODE_DATA, null, BARCODE_TYPE, null, Color.BLACK, 0, null, 0);
 
         ActivityController activityController = createActivityWithLoyaltyCard(false, (int) cardId);
         Activity activity = (Activity) activityController.get();
@@ -1215,7 +1231,7 @@ public class LoyaltyCardViewActivityTest {
         final Context context = ApplicationProvider.getApplicationContext();
         SQLiteDatabase database = TestHelpers.getEmptyDb(context).getWritableDatabase();
 
-        long cardId = DBHelper.insertLoyaltyCard(database, "store", "note", null, null, new BigDecimal("0"), null, BARCODE_DATA, null, BARCODE_TYPE, Color.BLACK, 0, null, 0);
+        long cardId = DBHelper.insertLoyaltyCard(database, "store", "note", null, null, new BigDecimal("0"), null, BARCODE_DATA, null, BARCODE_TYPE, null, Color.BLACK, 0, null, 0);
 
         ActivityController activityController = createActivityWithLoyaltyCard(false, (int) cardId);
         AppCompatActivity activity = (AppCompatActivity) activityController.get();
@@ -1311,7 +1327,7 @@ public class LoyaltyCardViewActivityTest {
         final Context context = ApplicationProvider.getApplicationContext();
         SQLiteDatabase database = TestHelpers.getEmptyDb(context).getWritableDatabase();
 
-        long cardId = DBHelper.insertLoyaltyCard(database, "store", "note", null, null, new BigDecimal("0"), null, BARCODE_DATA, null, null, Color.BLACK, 0, null, 0);
+        long cardId = DBHelper.insertLoyaltyCard(database, "store", "note", null, null, new BigDecimal("0"), null, BARCODE_DATA, null, null, null, Color.BLACK, 0, null, 0);
 
         ActivityController activityController = createActivityWithLoyaltyCard(false, (int) cardId);
         AppCompatActivity activity = (AppCompatActivity) activityController.get();
@@ -1350,7 +1366,7 @@ public class LoyaltyCardViewActivityTest {
     public void importCard() {
         Date date = new Date();
 
-        Uri importUri = Uri.parse("https://catima.app/share#store%3DExample%2BStore%26note%3D%26validfrom%3D" + date.getTime() + "%26expiry%3D" + date.getTime() + "%26balance%3D10.00%26balancetype%3DUSD%26cardid%3D123456%26barcodetype%3DAZTEC%26headercolor%3D-416706");
+        Uri importUri = Uri.parse("https://catima.app/share#store%3DExample%2BStore%26note%3D%26validfrom%3D" + date.getTime() + "%26expiry%3D" + date.getTime() + "%26balance%3D10.00%26balancetype%3DUSD%26cardid%3D123456%26barcodetype%3DAZTEC%26barcodeencoding%3D" + StandardCharsets.UTF_8.name() + "%26headercolor%3D-416706");
 
         Intent intent = new Intent();
         intent.setData(importUri);
@@ -1366,7 +1382,7 @@ public class LoyaltyCardViewActivityTest {
 
         shadowOf(getMainLooper()).idle();
 
-        checkAllFields(activity, ViewMode.ADD_CARD, "Example Store", "", DateFormat.getDateInstance(DateFormat.LONG).format(date), DateFormat.getDateInstance(DateFormat.LONG).format(date), "10.00", "$", "123456", context.getString(R.string.sameAsCardId), "Aztec", null, null);
+        checkAllFields(activity, ViewMode.ADD_CARD, "Example Store", "", DateFormat.getDateInstance(DateFormat.LONG).format(date), DateFormat.getDateInstance(DateFormat.LONG).format(date), "10.00", "$", "123456", context.getString(R.string.sameAsCardId), "Aztec", StandardCharsets.UTF_8.name(), null, null);
         assertEquals(-416706, ((ColorDrawable) activity.findViewById(R.id.thumbnail).getBackground()).getColor());
     }
 
@@ -1386,7 +1402,7 @@ public class LoyaltyCardViewActivityTest {
         Activity activity = (Activity) activityController.get();
         final Context context = activity.getApplicationContext();
 
-        checkAllFields(activity, ViewMode.ADD_CARD, "Example Store", "", context.getString(R.string.anyDate), context.getString(R.string.never), "0", context.getString(R.string.points), "123456", context.getString(R.string.sameAsCardId), "Aztec", null, null);
+        checkAllFields(activity, ViewMode.ADD_CARD, "Example Store", "", context.getString(R.string.anyDate), context.getString(R.string.never), "0", context.getString(R.string.points), "123456", context.getString(R.string.sameAsCardId), "Aztec", context.getString(R.string.automatic), null, null);
         assertEquals(-416706, ((ColorDrawable) activity.findViewById(R.id.thumbnail).getBackground()).getColor());
     }
 }