Merge pull request #2888 from CatimaLoyalty/dependabot/gradle/org.jetbrains.kotlin.android-2.3.0

Bump org.jetbrains.kotlin.android from 2.2.21 to 2.3.0

.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

app/build.gradle.kts

@@ -1,9 +1,9 @@
 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 {
@@ -48,7 +48,6 @@ android {
 
     buildFeatures {
         buildConfig = true
-        compose = true
         viewBinding = true
     }
 
@@ -76,16 +75,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")
@@ -104,8 +93,18 @@ android {
     lint {
         lintConfig = file("lint.xml")
     }
-    kotlinOptions {
-        jvmTarget = "17"
+    kotlin {
+        compilerOptions {
+            jvmTarget = JvmTarget.JVM_21
+        }
+    }
+    compileOptions {
+        encoding = "UTF-8"
+
+        // Flag to enable support for the new language APIs
+        isCoreLibraryDesugaringEnabled = true
+        sourceCompatibility = JavaVersion.VERSION_21
+        targetCompatibility = JavaVersion.VERSION_21
     }
 }
 
@@ -122,19 +121,6 @@ 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)
@@ -154,8 +140,6 @@ 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

@@ -1,89 +0,0 @@
-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,167 +1,149 @@
 package protect.card_locker
 
 import android.os.Bundle
-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 android.text.Spanned
+import android.view.MenuItem
+import android.view.View
+import android.widget.ScrollView
+import android.widget.TextView
 
-class AboutActivity : ComponentActivity() {
+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
     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()
 
-        setContent {
-            CatimaTheme {
-                AboutScreenContent(
-                    content = content,
-                    showDonate = BuildConfig.showDonate,
-                    showRateOnGooglePlay = BuildConfig.showRateOnGooglePlay,
-                    onBackPressedDispatcher = onBackPressedDispatcher
-                )
+        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
             }
+
+            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,8 +3,11 @@ 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;
@@ -52,7 +55,7 @@ public class AboutContent {
         return context.getString(R.string.app_copyright_short);
     }
 
-    public String getContributorsHtml() {
+    public String getContributors() {
         String contributors;
         try {
             contributors = "<br/>" + Utils.readTextFile(context, R.raw.contributors);
@@ -62,7 +65,7 @@ public class AboutContent {
         return contributors.replace("\n", "<br />");
     }
 
-    public String getHistoryHtml() {
+    public String getHistory() {
         String versionHistory;
         try {
             versionHistory = Utils.readTextFile(context, R.raw.changelog)
@@ -74,7 +77,7 @@ public class AboutContent {
                 .replace("\n", "<br />");
     }
 
-    public String getLicenseHtml() {
+    public String getLicense() {
         try {
             return Utils.readTextFile(context, R.raw.license);
         }  catch (IOException ignored) {
@@ -82,7 +85,7 @@ public class AboutContent {
         }
     }
 
-    public String getPrivacyHtml() {
+    public String getPrivacy() {
         String privacyPolicy;
         try {
             privacyPolicy = Utils.readTextFile(context, R.raw.privacy)
@@ -94,7 +97,7 @@ public class AboutContent {
                 .replace("\n", "<br />");
     }
 
-    public String getThirdPartyLibrariesHtml() {
+    public String getThirdPartyLibraries() {
         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"));
@@ -113,7 +116,7 @@ public class AboutContent {
         return result.toString();
     }
 
-    public String getUsedThirdPartyAssetsHtml() {
+    public String getUsedThirdPartyAssets() {
         final List<ThirdPartyInfo> usedAssets = new ArrayList<>();
         usedAssets.add(new ThirdPartyInfo("Android icons", "https://fonts.google.com/icons?selected=Material+Icons", "Apache 2.0"));
 
@@ -126,19 +129,31 @@ public class AboutContent {
         return result.toString();
     }
 
-    public String getContributorInfoHtml() {
+    public Spanned getContributorInfo() {
         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), getContributorsHtml()));
+        contributorInfo.append(String.format(context.getString(R.string.app_contributors), getContributors()));
         contributorInfo.append("<br/><br/>");
-        contributorInfo.append(String.format(context.getString(R.string.app_libraries), getThirdPartyLibrariesHtml()));
+        contributorInfo.append(String.format(context.getString(R.string.app_libraries), getThirdPartyLibraries()));
         contributorInfo.append("<br/><br/>");
-        contributorInfo.append(String.format(context.getString(R.string.app_resources), getUsedThirdPartyAssetsHtml()));
+        contributorInfo.append(String.format(context.getString(R.string.app_resources), getUsedThirdPartyAssets()));
 
-        return contributorInfo.toString();
+        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);
     }
 
     public String getVersionHistory() {

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 {

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

@@ -1,17 +1,18 @@
 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(Activity activity, String url) {
+    public void openBrowser(AppCompatActivity activity, String url) {
         if (url == null) {
             return;
         }

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/compose/AboutActivity.kt

@@ -1,97 +0,0 @@
-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

@@ -1,34 +0,0 @@
-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

@@ -1,46 +0,0 @@
-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.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))
-    }
-
-    val darkTheme = if (isDynamicColorSupported) {
-        dynamicDarkColorScheme(context)
-    } else {
-        darkColorScheme(primary = colorResource(id = R.color.md_theme_dark_primary))
-    }
-
-    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/res/layout/about_activity.xml

@@ -0,0 +1,421 @@
+<?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/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

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/settings.xml

@@ -144,6 +144,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

@@ -361,5 +361,4 @@
     <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="back">Back</string>
 </resources>

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

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

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

@@ -0,0 +1,171 @@
+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())
+    }
+}

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

@@ -0,0 +1 @@
+- Dem Hauptbildschirm eine Option zum Duplizieren hinzugefügt und die Optionen etwas verändert angeordnet

gradle/libs.versions.toml

@@ -1,7 +1,4 @@
 [versions]
-# AndroidX
-compose = "2025.11.01"
-
 # Third-party
 acra = "5.13.1"
 
@@ -21,16 +18,6 @@ androidx-preference-preference = { group = "androidx.preference", name = "prefer
 com-google-android-material-material = { group = "com.google.android.material", name = "material", version = "1.13.0" }
 com-android-tools-desugar_jdk_libs = { group = "com.android.tools", name = "desugar_jdk_libs", version = "2.1.5" }
 
-# Compose
-androidx-activity-activity-compose = { group = "androidx.activity", name = "activity-compose", version = "1.10.1" }
-androidx-compose-compose-bom = { group = "androidx.compose", name = "compose-bom", version.ref = "compose" }
-androidx-compose-foundation-foundation = { group = "androidx.compose.foundation", name = "foundation" }
-androidx-compose-material3-material3 = { group = "androidx.compose.material3", name = "material3"}
-androidx-compose-material-material-icons-extended = { group = "androidx.compose.material", name = "material-icons-extended", version = "1.7.8" }
-androidx-compose-ui-ui-tooling-preview-android = { group = "androidx.compose.ui", name = "ui-tooling-preview-android" }
-androidx-compose-ui-ui-test-manifest = { group = "androidx.compose.ui", name = "ui-test-manifest" }
-androidx-compose-ui-ui-test-junit4 = { group = "androidx.compose.ui", name = "ui-test-junit4" }
-
 # Third-party
 com-journeyapps-zxing_android_embedded = { group = "com.journeyapps", name = "zxing-android-embedded", version = "4.3.0" }
 com-github-yalantis-ucrop = { group = "com.github.yalantis", name = "ucrop", version = "2.2.11" }
@@ -43,7 +30,6 @@ ch-acra-acra-dialog = { group = "ch.acra", name = "acra-dialog", version.ref = "
 
 # Testing
 androidx-test-core = { group = "androidx.test", name = "core", version.ref = "androidXTest" }
-androidx-test-rules = { group = "androidx.test", name = "rules", version.ref = "androidXTest" }
 androidx-test-runner = { group = "androidx.test", name = "runner", version.ref = "androidXTest" }
 androidx-test-ext-junit = { group = "androidx.test.ext", name = "junit", version = "1.3.0" }
 androidx-test-uiautomator-uiautomator = { group = "androidx.test.uiautomator", name = "uiautomator", version = "2.3.0" }
@@ -53,8 +39,7 @@ org-robolectric-robolectric = { group = "org.robolectric", name = "robolectric",
 
 [plugins]
 com-android-application = { id = "com.android.application", version = "8.13.2" }
-org-jetbrains-kotlin-android = { id = "org.jetbrains.kotlin.android", version = "2.2.21" }
-org-jetbrains-kotlin-plugin-compose = { id = "org.jetbrains.kotlin.plugin.compose", version = "2.1.21" }
+org-jetbrains-kotlin-android = { id = "org.jetbrains.kotlin.android", version = "2.3.0" }
 
 [bundles]
 acra = ["ch-acra-acra-mail", "ch-acra-acra-dialog"]