Compare commits

..

9 Commits

Author SHA1 Message Date
Sylvia van Os
68d5dcd5f3 Release Catima 2.41.1 2025-12-31 17:51:13 +01:00
Sylvia van Os
d9905665b2 Merge pull request #2914 from weblate/weblate-catima-catima
Translations update from Hosted Weblate
2025-12-31 17:50:29 +01:00
B o d o
58af4bae55 Translated using Weblate (German)
Currently translated at 100.0% (316 of 316 strings)

Translation: Catima/Android
Translate-URL: https://hosted.weblate.org/projects/catima/catima/de/
2025-12-31 17:08:27 +01:00
Sylvia van Os
9c5aefd8d1 Translated using Weblate (Spanish (Argentina))
Currently translated at 75.3% (238 of 316 strings)

Translation: Catima/Android
Translate-URL: https://hosted.weblate.org/projects/catima/catima/es_AR/
2025-12-31 17:08:27 +01:00
Sylvia van Os
bca0e07c23 Merge pull request #2913 from CatimaLoyalty/create-pull-request/patch-1767197144
Update Fastlane changelogs
2025-12-31 17:06:54 +01:00
TheLastProject
4676c2c2b3 Update Fastlane changelogs 2025-12-31 16:05:43 +00:00
Sylvia van Os
196542ce5e Update CHANGELOG 2025-12-31 17:05:32 +01:00
Sylvia van Os
a550bcca07 Merge pull request #2912 from CatimaLoyalty/fix/2911
Fix Compose status and navigation bar theming
2025-12-31 17:03:58 +01:00
Sylvia van Os
17d3d86127 Fix Compose status and navigation bar theming
Especially affects Android 14 and below, but also slightly 15 and up
2025-12-31 12:43:11 +01:00
7 changed files with 56 additions and 7 deletions

View File

@@ -1,5 +1,9 @@
# Changelog
## v2.41.1 - 158 (2025-12-31)
- Fix status and navigation bar colour in new About activity
## v2.41.0 - 157 (2025-12-30)
- Add support for UTF-8 barcodes

View File

@@ -19,8 +19,8 @@ android {
applicationId = "me.hackerchick.catima"
minSdk = 21
targetSdk = 36
versionCode = 157
versionName = "2.41.0"
versionCode = 158
versionName = "2.41.1"
vectorDrawables.useSupportLibrary = true
multiDexEnabled = true

View File

@@ -1,7 +1,6 @@
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
@@ -26,12 +25,15 @@ import protect.card_locker.compose.CatimaAboutSection
import protect.card_locker.compose.CatimaTopAppBar
import protect.card_locker.compose.theme.CatimaTheme
class AboutActivity : ComponentActivity() {
class AboutActivity : CatimaComponentActivity() {
private lateinit var content: AboutContent
@OptIn(ExperimentalMaterial3Api::class)
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
fixedEdgeToEdge()
content = AboutContent(this)
title = content.pageTitle

View File

@@ -0,0 +1,42 @@
package protect.card_locker
import android.graphics.Color
import android.os.Bundle
import android.os.PersistableBundle
import androidx.activity.ComponentActivity
import androidx.activity.SystemBarStyle
import androidx.activity.enableEdgeToEdge
import androidx.appcompat.app.AppCompatDelegate
import protect.card_locker.preferences.Settings
open class CatimaComponentActivity() : ComponentActivity() {
fun fixedEdgeToEdge() {
// Fix edge-to-edge
// When overriding onCreate this does not correctly get applied, which is why it is its own function
// We explicitly need to set the systemBarStyle ourselves, to prevent issues where Android
// for example renders white icons on top of a white statusbar (or black on black)
val settings = Settings(this)
val systemBarStyle = when (settings.theme) {
AppCompatDelegate.MODE_NIGHT_NO ->
SystemBarStyle.light(
scrim = Color.TRANSPARENT,
darkScrim = Color.TRANSPARENT,
)
AppCompatDelegate.MODE_NIGHT_YES ->
SystemBarStyle.dark(
scrim = Color.TRANSPARENT,
)
else ->
SystemBarStyle.auto(
lightScrim = Color.TRANSPARENT,
darkScrim = Color.TRANSPARENT
)
}
enableEdgeToEdge(
statusBarStyle = systemBarStyle,
navigationBarStyle = systemBarStyle
)
}
}

View File

@@ -33,8 +33,8 @@
<string name="exportFailed">Export konnte nicht durchgeführt werden</string>
<string name="importing">Importiere…</string>
<string name="exporting">Exportiere…</string>
<string name="importOptionFilesystemTitle">Aus Dateisystem importieren</string>
<string name="importOptionFilesystemExplanation">Wähle eine bestimmte Datei aus dem Dateisystem aus</string>
<string name="importOptionFilesystemTitle">Import vom Dateisystem</string>
<string name="importOptionFilesystemExplanation">Wähle eine bestimmte Datei aus dem Dateisystem</string>
<string name="importOptionFilesystemButton">vom Dateisystem</string>
<string name="about">Über</string>
<string name="app_license">Freie Software, lizensiert unter der GPLv3+</string>

View File

@@ -203,7 +203,7 @@
<string name="license">Licencia</string>
<string name="on_github">en GitHub</string>
<string name="rate_this_app">Califica esta app</string>
<string name="on_google_play">En Google Play</string>
<string name="on_google_play">en Google Play</string>
<string name="report_error">Reportar error</string>
<string name="translate_platform">en Weblate</string>
<string name="shortcutSelectCard">Selecciona una tarjeta</string>

View File

@@ -0,0 +1 @@
- Fix status and navigation bar colour in new About activity