Skip to content

Commit 75cb067

Browse files
Merge branch 'master' into fixProcess
2 parents 4c0d369 + fefd089 commit 75cb067

File tree

5 files changed

+33
-9
lines changed

5 files changed

+33
-9
lines changed

README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ https://github.com/yogeshpaliyal/KeyPass/discussions/1085
3838
- [x] Auto Backup
3939
- [x] TOTP
4040
- [x] Jetpack Compose
41+
- [x] Autofill Service
4142
#### Import From
4243
- [x] Google Chrome CSV
4344
- [x] KeePass CSV

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

Lines changed: 24 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,28 @@
77
<string name="delete">Kustuta</string>
88
<string name="invalid_csv">Vigane csv-fail</string>
99
<string name="invalid_keyphrase">Vigane salafraas</string>
10-
<string name="valid_keyphrase">Vigane salafraas</string>
10+
<string name="valid_keyphrase">Kehtiv salafraas</string>
11+
<string name="app_desc">Avatud lähtekoodil põhinev ja võrguühendust mittevajav salasõnahaldur. Hoia, halda ja kontrolli oma salasõnu turvaliselt.</string>
12+
<string name="backup_completed">Varukoopia on tehtud</string>
13+
<string name="app_developer">Arendaja</string>
14+
<string name="app_developer_x">X (varem Twitter)</string>
15+
<string name="app_developer_linkedin">LinkedIn</string>
16+
<string name="source_code">Lähtekood</string>
17+
<string name="app_developer_github">Github</string>
18+
<string name="share">Jaga</string>
19+
<string name="about_us">Rakenduse teave</string>
20+
<string name="share_desc">Jaga rakendust teistega</string>
21+
<string name="password">Salasõna</string>
22+
<string name="copied_to_clipboard">Kopeeritud lõikelauale</string>
23+
<string name="login_to_enter_keypass">KeyPassi kasutamiseks logi sisse</string>
24+
<string name="last_backup_date">Viimane varukoopia:%s</string>
25+
<string name="delete_account_title">Kas sa oled kindel?</string>
26+
<string name="delete_account_msg">Kas sa kindlasti soovid selle kirje kustutada, seda tegevust ei saa tagasi pöörata</string>
27+
<string name="cancel">Katkesta</string>
28+
<string name="share_keypass">Jaga KeyPassi teavet</string>
29+
<string name="turn_off_backup">Lülita varukoopiate tegemine välja</string>
30+
<string name="backup_folder">Varukoopiate kaust</string>
31+
<string name="turn_on_backup">Lülita varukoopiate tegemine sisse</string>
32+
<string name="feedback_to_keypass">Tagasiside KeyPassi kohta</string>
33+
<string name="message_no_accounts">Kasutajakontosid ei leidu, palun lisa mõni all ääres olevast nupust</string>
1134
</resources>

buildSrc/src/main/kotlin/Versions.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
object Versions {
22
const val kotlin = "2.0.21"
33
const val lifecycle = "2.6.1"
4-
const val room = "2.6.1"
4+
const val room = "2.7.0"
55
const val navigation = "2.5.3"
66
const val hilt = "2.55"
77
const val compose = "1.7.8"

common/build.gradle.kts

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -35,14 +35,14 @@ android {
3535

3636
dependencies {
3737

38-
api("androidx.core:core-ktx:1.15.0")
38+
api("androidx.core:core-ktx:1.16.0")
3939
api("androidx.appcompat:appcompat:1.7.0")
4040

4141
// apache common codec
4242
implementation("commons-codec:commons-codec:1.18.0")
4343

4444
// Androidx Security
45-
implementation("androidx.security:security-crypto:1.1.0-alpha06")
45+
implementation("androidx.security:security-crypto:1.1.0-alpha07")
4646

4747
api("androidx.documentfile:documentfile:1.0.1")
4848

@@ -61,19 +61,19 @@ dependencies {
6161

6262
api("com.google.android.material:material:1.12.0")
6363

64-
implementation("com.google.code.gson:gson:2.12.1")
64+
implementation("com.google.code.gson:gson:2.13.0")
6565

66-
api("com.google.code.gson:gson:2.12.1")
66+
api("com.google.code.gson:gson:2.13.0")
6767

6868
api("androidx.datastore:datastore-preferences:1.1.4")
69-
implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.7.3")
69+
implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.8.1")
7070

7171
// Test
7272
implementation("androidx.test.ext:junit-ktx:1.2.1")
7373
androidTestApi("androidx.test:rules:1.6.1")
7474

7575
implementation("net.zetetic:android-database-sqlcipher:4.5.4")
76-
implementation("androidx.sqlite:sqlite:2.4.0")
76+
implementation("androidx.sqlite:sqlite:2.5.0")
7777

7878
api("com.opencsv:opencsv:5.10")
7979
}

shared/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ kotlin {
2929
val androidMain by getting {
3030
dependencies {
3131
api("androidx.appcompat:appcompat:1.7.0")
32-
api("androidx.core:core-ktx:1.15.0")
32+
api("androidx.core:core-ktx:1.16.0")
3333
}
3434
}
3535
val androidUnitTest by getting {

0 commit comments

Comments
 (0)