From 8e546f7c6dd5566cf170a8c23e5d3317fcc75bd1 Mon Sep 17 00:00:00 2001 From: Igor Bubelov Date: Fri, 3 May 2024 17:16:32 +0700 Subject: [PATCH] Fix compiler and lint issues --- CHANGELOG.md | 1 + app/build.gradle.kts | 30 ++--- app/src/main/AndroidManifest.xml | 2 + app/src/main/kotlin/element/ElementQueries.kt | 119 ++++++++---------- app/src/main/kotlin/event/EventQueries.kt | 36 +++--- app/src/main/kotlin/reports/ReportQueries.kt | 16 +-- app/src/main/kotlin/user/UserQueries.kt | 14 ++- app/src/main/res/layout/fragment_reports.xml | 4 +- app/src/main/res/layout/item_area.xml | 3 +- app/src/main/res/layout/item_area_element.xml | 3 +- app/src/main/res/values-af/strings.xml | 4 +- app/src/main/res/values-ar/strings.xml | 4 +- app/src/main/res/values-bg/strings.xml | 4 +- app/src/main/res/values-bn/strings.xml | 4 +- app/src/main/res/values-ca/strings.xml | 4 +- app/src/main/res/values-cs/strings.xml | 4 +- app/src/main/res/values-da/strings.xml | 4 +- app/src/main/res/values-de/strings.xml | 4 +- app/src/main/res/values-el/strings.xml | 4 +- app/src/main/res/values-es/strings.xml | 4 +- app/src/main/res/values-fa/strings.xml | 4 +- app/src/main/res/values-fi/strings.xml | 4 +- app/src/main/res/values-fr/strings.xml | 4 +- app/src/main/res/values-hi/strings.xml | 4 +- app/src/main/res/values-hu/strings.xml | 4 +- app/src/main/res/values-it/strings.xml | 4 +- app/src/main/res/values-iw/strings.xml | 4 +- app/src/main/res/values-ja/strings.xml | 4 +- app/src/main/res/values-ko/strings.xml | 4 +- app/src/main/res/values-nl/strings.xml | 4 +- app/src/main/res/values-no/strings.xml | 4 +- app/src/main/res/values-pl/strings.xml | 4 +- app/src/main/res/values-pt/strings.xml | 4 +- app/src/main/res/values-ro/strings.xml | 4 +- app/src/main/res/values-ru/strings.xml | 4 +- app/src/main/res/values-sr/strings.xml | 4 +- app/src/main/res/values-sv/strings.xml | 4 +- app/src/main/res/values-th/strings.xml | 4 +- app/src/main/res/values-tr/strings.xml | 4 +- app/src/main/res/values-uk/strings.xml | 4 +- app/src/main/res/values-ur/strings.xml | 4 +- app/src/main/res/values-vi/strings.xml | 4 +- app/src/main/res/values-zh/strings.xml | 4 +- app/src/main/res/values/strings.xml | 4 +- app/src/main/res/xml/backup_rules.xml | 37 ++++++ gradle/libs.versions.toml | 2 +- 46 files changed, 218 insertions(+), 185 deletions(-) create mode 100644 app/src/main/res/xml/backup_rules.xml diff --git a/CHANGELOG.md b/CHANGELOG.md index c403018f..6cea02ad 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,6 +11,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/). - Add place directions - Add share location button - Add companion app warnings for the minority of places which require it +- Fix crashes during sync ## [0.7.2] - 2023-04-26 diff --git a/app/build.gradle.kts b/app/build.gradle.kts index daa383a2..e77c8d32 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -1,4 +1,4 @@ -import java.net.URL +import java.net.URI plugins { alias(libs.plugins.android.application) @@ -18,12 +18,12 @@ android { } compileOptions { - sourceCompatibility = JavaVersion.VERSION_1_8 - targetCompatibility = JavaVersion.VERSION_1_8 + sourceCompatibility = JavaVersion.VERSION_11 + targetCompatibility = JavaVersion.VERSION_11 } kotlinOptions { - jvmTarget = "1.8" + jvmTarget = "11" freeCompilerArgs += "-opt-in=kotlinx.coroutines.DelicateCoroutinesApi" freeCompilerArgs += "-opt-in=kotlinx.coroutines.ExperimentalCoroutinesApi" } @@ -100,20 +100,20 @@ tasks.register("bundleData") { val destDir = File(projectDir, "src/main/assets") destDir.mkdirs() - val elementsSrc = URL("https://static.btcmap.org/api/v3/elements.json") - File(destDir, "elements.json").writeText(elementsSrc.readText()) + val elementsSrc = URI("https://static.btcmap.org/api/v3/elements.json") + File(destDir, "elements.json").writeText(elementsSrc.toURL().readText()) - val reportsSrc = URL("https://static.btcmap.org/api/v2/reports.json") - File(destDir, "reports.json").writeText(reportsSrc.readText()) + val reportsSrc = URI("https://static.btcmap.org/api/v2/reports.json") + File(destDir, "reports.json").writeText(reportsSrc.toURL().readText()) - val eventsSrc = URL("https://static.btcmap.org/api/v2/events.json") - File(destDir, "events.json").writeText(eventsSrc.readText()) + val eventsSrc = URI("https://static.btcmap.org/api/v2/events.json") + File(destDir, "events.json").writeText(eventsSrc.toURL().readText()) - val areasSrc = URL("https://static.btcmap.org/api/v2/areas.json") - File(destDir, "areas.json").writeText(areasSrc.readText()) + val areasSrc = URI("https://static.btcmap.org/api/v2/areas.json") + File(destDir, "areas.json").writeText(areasSrc.toURL().readText()) - val usersSrc = URL("https://static.btcmap.org/api/v2/users.json") - File(destDir, "users.json").writeText(usersSrc.readText()) + val usersSrc = URI("https://static.btcmap.org/api/v2/users.json") + File(destDir, "users.json").writeText(usersSrc.toURL().readText()) } } @@ -124,6 +124,7 @@ dependencies { implementation(libs.androidx.navigation.ui.ktx) implementation(libs.androidx.preference.ktx) implementation(libs.androidx.sqlite.ktx) + implementation(libs.androidx.work.runtime.ktx) implementation(libs.androidx.constraintlayout) implementation(libs.material) @@ -137,7 +138,6 @@ dependencies { implementation(libs.sqlite) implementation(libs.coil.core) implementation(libs.coil.svg) - implementation(libs.androidx.work.runtime.ktx) testImplementation(libs.junit) testImplementation(libs.json) diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index c8dd4c3e..9d6cc26f 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -15,6 +15,8 @@ { - return withContext(Dispatchers.IO) { - val cursor = db.readableDatabase.query( - """ - SELECT - json_extract(tags, '$.category') AS category, - count(*) AS elements - FROM element - WHERE deleted_at = '' - GROUP BY category - ORDER BY category; - """ - ) - buildList { while (cursor.moveToNext()) { add( - ElementCategory( - id = cursor.getString(0), - elements = cursor.getLong(1), + AreaElement( + id = cursor.getLong(0), + lat = cursor.getDouble(1), + lon = cursor.getDouble(2), + icon = cursor.getString(3), + osmTags = cursor.getJsonObject(4), + issues = cursor.getJsonArray(5), + osmType = cursor.getString(6), + osmId = cursor.getLong(7), ) ) } diff --git a/app/src/main/kotlin/event/EventQueries.kt b/app/src/main/kotlin/event/EventQueries.kt index 01d4c96f..bc376699 100644 --- a/app/src/main/kotlin/event/EventQueries.kt +++ b/app/src/main/kotlin/event/EventQueries.kt @@ -67,14 +67,16 @@ class EventQueries(private val db: SQLiteOpenHelper) { buildList { while (cursor.moveToNext()) { - this += EventListItem( - eventType = cursor.getString(0), - elementId = cursor.getLong(1), - osmId = cursor.getStringOrNull(2) ?: "", - elementName = cursor.getStringOrNull(3) ?: "", - eventDate = cursor.getZonedDateTime(4)!!, - userName = cursor.getString(5), - userTips = getLnUrl(cursor.getString(6)), + add( + EventListItem( + eventType = cursor.getString(0), + elementId = cursor.getLong(1), + osmId = cursor.getStringOrNull(2) ?: "", + elementName = cursor.getStringOrNull(3) ?: "", + eventDate = cursor.getZonedDateTime(4)!!, + userName = cursor.getString(5), + userTips = getLnUrl(cursor.getString(6)), + ) ) } } @@ -102,14 +104,16 @@ class EventQueries(private val db: SQLiteOpenHelper) { buildList { while (cursor.moveToNext()) { - this += EventListItem( - eventType = cursor.getString(0), - elementId = cursor.getLong(1), - osmId = cursor.getStringOrNull(2) ?: "", - elementName = cursor.getStringOrNull(3) ?: "", - eventDate = cursor.getZonedDateTime(4)!!, - userName = "", - userTips = "", + add( + EventListItem( + eventType = cursor.getString(0), + elementId = cursor.getLong(1), + osmId = cursor.getStringOrNull(2) ?: "", + elementName = cursor.getStringOrNull(3) ?: "", + eventDate = cursor.getZonedDateTime(4)!!, + userName = "", + userTips = "", + ) ) } } diff --git a/app/src/main/kotlin/reports/ReportQueries.kt b/app/src/main/kotlin/reports/ReportQueries.kt index 28fe4919..9584b2b6 100644 --- a/app/src/main/kotlin/reports/ReportQueries.kt +++ b/app/src/main/kotlin/reports/ReportQueries.kt @@ -62,13 +62,15 @@ class ReportQueries(private val db: SQLiteOpenHelper) { buildList { while (cursor.moveToNext()) { - this += Report( - areaId = cursor.getString(0), - date = cursor.getDate(1), - tags = cursor.getJsonObject(2), - createdAt = cursor.getZonedDateTime(3)!!, - updatedAt = cursor.getZonedDateTime(4)!!, - deletedAt = cursor.getZonedDateTime(5), + add( + Report( + areaId = cursor.getString(0), + date = cursor.getDate(1), + tags = cursor.getJsonObject(2), + createdAt = cursor.getZonedDateTime(3)!!, + updatedAt = cursor.getZonedDateTime(4)!!, + deletedAt = cursor.getZonedDateTime(5), + ) ) } } diff --git a/app/src/main/kotlin/user/UserQueries.kt b/app/src/main/kotlin/user/UserQueries.kt index ddfd368a..6e776c8c 100644 --- a/app/src/main/kotlin/user/UserQueries.kt +++ b/app/src/main/kotlin/user/UserQueries.kt @@ -61,12 +61,14 @@ data class UserQueries(private val db: SQLiteOpenHelper) { buildList { while (cursor.moveToNext()) { - this += UserListItem( - id = cursor.getLong(0), - image = cursor.getHttpUrl(1), - name = cursor.getString(2), - tips = getLnUrl(cursor.getString(3)), - changes = cursor.getLong(4), + add( + UserListItem( + id = cursor.getLong(0), + image = cursor.getHttpUrl(1), + name = cursor.getString(2), + tips = getLnUrl(cursor.getString(3)), + changes = cursor.getLong(4), + ) ) } } diff --git a/app/src/main/res/layout/fragment_reports.xml b/app/src/main/res/layout/fragment_reports.xml index 555adcaa..f90267be 100644 --- a/app/src/main/res/layout/fragment_reports.xml +++ b/app/src/main/res/layout/fragment_reports.xml @@ -128,7 +128,7 @@ @@ -165,7 +165,7 @@ diff --git a/app/src/main/res/layout/item_area.xml b/app/src/main/res/layout/item_area.xml index f39e1e6e..eddb093a 100644 --- a/app/src/main/res/layout/item_area.xml +++ b/app/src/main/res/layout/item_area.xml @@ -7,7 +7,8 @@ android:layout_height="wrap_content" android:background="?selectableItemBackground" android:baselineAligned="false" - android:gravity="center_vertical"> + android:gravity="center_vertical" + tools:ignore="Overdraw"> + android:paddingTop="1dp" + tools:ignore="UseCompoundDrawables"> Verify or Report ATM Checkmark icon - Fetching recent changes Database Updated: %1$s Database is empty @@ -45,7 +44,6 @@ Cafes Hotel Hotels - Other Other Pub Pubs @@ -65,6 +63,8 @@ Share unknown You\'ll need a companion app (%1$s) in order to make a payment. This app doesn\'t require you to fill any personal data, to the best of our knowledge. Please let us know if it\'s not the case and we\'ll remove this place. + Percentage of verified places + Days since verified %d change %d changes diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml index 9656c36c..e2fe0e1d 100644 --- a/app/src/main/res/values-ar/strings.xml +++ b/app/src/main/res/values-ar/strings.xml @@ -33,7 +33,6 @@ Verify or Report ATM Checkmark icon - Fetching recent changes Database Updated: %1$s Database is empty @@ -45,7 +44,6 @@ Cafes Hotel Hotels - Other Other Pub Pubs @@ -65,6 +63,8 @@ Share unknown You\'ll need a companion app (%1$s) in order to make a payment. This app doesn\'t require you to fill any personal data, to the best of our knowledge. Please let us know if it\'s not the case and we\'ll remove this place. + Percentage of verified places + Days since verified %d changes %d change diff --git a/app/src/main/res/values-bg/strings.xml b/app/src/main/res/values-bg/strings.xml index 614a56f7..c2cd3a59 100644 --- a/app/src/main/res/values-bg/strings.xml +++ b/app/src/main/res/values-bg/strings.xml @@ -33,7 +33,6 @@ Удостоверете или Докладвайте Банкомат Икона на отметка - Извличане на последните промени База данни Променено на: %1$s Базата данни е празна @@ -45,7 +44,6 @@ Кафета Хотел Хотели - Други Други Кръчма Кръчми @@ -65,6 +63,8 @@ Share unknown You\'ll need a companion app (%1$s) in order to make a payment. This app doesn\'t require you to fill any personal data, to the best of our knowledge. Please let us know if it\'s not the case and we\'ll remove this place. + Percentage of verified places + Days since verified %d промяна %d промени diff --git a/app/src/main/res/values-bn/strings.xml b/app/src/main/res/values-bn/strings.xml index 1745c38b..12dc7a74 100644 --- a/app/src/main/res/values-bn/strings.xml +++ b/app/src/main/res/values-bn/strings.xml @@ -33,7 +33,6 @@ Verify or Report ATM Checkmark icon - Fetching recent changes Database Updated: %1$s Database is empty @@ -45,7 +44,6 @@ Cafes Hotel Hotels - Other Other Pub Pubs @@ -65,6 +63,8 @@ Share unknown You\'ll need a companion app (%1$s) in order to make a payment. This app doesn\'t require you to fill any personal data, to the best of our knowledge. Please let us know if it\'s not the case and we\'ll remove this place. + Percentage of verified places + Days since verified %d change %d changes diff --git a/app/src/main/res/values-ca/strings.xml b/app/src/main/res/values-ca/strings.xml index c803947e..aa45d8d0 100644 --- a/app/src/main/res/values-ca/strings.xml +++ b/app/src/main/res/values-ca/strings.xml @@ -33,7 +33,6 @@ Verify or Report ATM Checkmark icon - Fetching recent changes Database Updated: %1$s Database is empty @@ -45,7 +44,6 @@ Cafes Hotel Hotels - Other Other Pub Pubs @@ -65,6 +63,8 @@ Share unknown You\'ll need a companion app (%1$s) in order to make a payment. This app doesn\'t require you to fill any personal data, to the best of our knowledge. Please let us know if it\'s not the case and we\'ll remove this place. + Percentage of verified places + Days since verified %d change %d changes diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml index 83804b87..d71ace02 100644 --- a/app/src/main/res/values-cs/strings.xml +++ b/app/src/main/res/values-cs/strings.xml @@ -33,7 +33,6 @@ Ověř nebo Nahláš Bankomat Ikona zaškrtnutí - Stahuji poslední změny Databáze Aktualizováno: %1$s Databáze je prázdná @@ -45,7 +44,6 @@ Kavárny Hotel Hotely - Ostatní Ostatní Hospoda Hospody @@ -65,6 +63,8 @@ Share unknown You\'ll need a companion app (%1$s) in order to make a payment. This app doesn\'t require you to fill any personal data, to the best of our knowledge. Please let us know if it\'s not the case and we\'ll remove this place. + Percentage of verified places + Days since verified %d změn %d změn diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml index 1745c38b..12dc7a74 100644 --- a/app/src/main/res/values-da/strings.xml +++ b/app/src/main/res/values-da/strings.xml @@ -33,7 +33,6 @@ Verify or Report ATM Checkmark icon - Fetching recent changes Database Updated: %1$s Database is empty @@ -45,7 +44,6 @@ Cafes Hotel Hotels - Other Other Pub Pubs @@ -65,6 +63,8 @@ Share unknown You\'ll need a companion app (%1$s) in order to make a payment. This app doesn\'t require you to fill any personal data, to the best of our knowledge. Please let us know if it\'s not the case and we\'ll remove this place. + Percentage of verified places + Days since verified %d change %d changes diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index 67c11630..adb0bfb0 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -33,7 +33,6 @@ Verifizieren oder Melden Geldautomat Häkchen-Symbol - Fetching recent changes Datenbank Letzte Synchronisierung: %1$s Datenbank ist leer @@ -45,7 +44,6 @@ Cafés Hotel Hotels - Sonstiges Sonstiges Kneipe Kneipen @@ -65,6 +63,8 @@ Share unknown You\'ll need a companion app (%1$s) in order to make a payment. This app doesn\'t require you to fill any personal data, to the best of our knowledge. Please let us know if it\'s not the case and we\'ll remove this place. + Percentage of verified places + Days since verified %d Änderung %d Änderungen diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml index 77db3d3d..3d5df3fd 100644 --- a/app/src/main/res/values-el/strings.xml +++ b/app/src/main/res/values-el/strings.xml @@ -33,7 +33,6 @@ Επιβεβαίωση ή Αναφορά ATM Εικονίδιο Επιλογής - Fetching recent changes Βάση δεδομένων Τελευταίος συγχρονισμός: %1$s Η βάση δεδομένων είναι κενή @@ -45,7 +44,6 @@ Καφετέριες Ξενοδοχείοl Ξενοδοχεία - Άλλο Άλλα Pub Pubs @@ -65,6 +63,8 @@ Share unknown You\'ll need a companion app (%1$s) in order to make a payment. This app doesn\'t require you to fill any personal data, to the best of our knowledge. Please let us know if it\'s not the case and we\'ll remove this place. + Percentage of verified places + Days since verified %d αλλαγή %d αλλαγές diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index d7be8355..e136fc42 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -33,7 +33,6 @@ Verificar o informar Cajero automático Icono de marca de verificación - Fetching recent changes Base de datos Última sincronización: %1$s La base de datos está vacía @@ -45,7 +44,6 @@ Cafes Hotel Hoteles - Other Otro Pub Pubs @@ -65,6 +63,8 @@ Share unknown You\'ll need a companion app (%1$s) in order to make a payment. This app doesn\'t require you to fill any personal data, to the best of our knowledge. Please let us know if it\'s not the case and we\'ll remove this place. + Percentage of verified places + Days since verified %d cambio %d cambios diff --git a/app/src/main/res/values-fa/strings.xml b/app/src/main/res/values-fa/strings.xml index 1745c38b..12dc7a74 100644 --- a/app/src/main/res/values-fa/strings.xml +++ b/app/src/main/res/values-fa/strings.xml @@ -33,7 +33,6 @@ Verify or Report ATM Checkmark icon - Fetching recent changes Database Updated: %1$s Database is empty @@ -45,7 +44,6 @@ Cafes Hotel Hotels - Other Other Pub Pubs @@ -65,6 +63,8 @@ Share unknown You\'ll need a companion app (%1$s) in order to make a payment. This app doesn\'t require you to fill any personal data, to the best of our knowledge. Please let us know if it\'s not the case and we\'ll remove this place. + Percentage of verified places + Days since verified %d change %d changes diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml index 1745c38b..12dc7a74 100644 --- a/app/src/main/res/values-fi/strings.xml +++ b/app/src/main/res/values-fi/strings.xml @@ -33,7 +33,6 @@ Verify or Report ATM Checkmark icon - Fetching recent changes Database Updated: %1$s Database is empty @@ -45,7 +44,6 @@ Cafes Hotel Hotels - Other Other Pub Pubs @@ -65,6 +63,8 @@ Share unknown You\'ll need a companion app (%1$s) in order to make a payment. This app doesn\'t require you to fill any personal data, to the best of our knowledge. Please let us know if it\'s not the case and we\'ll remove this place. + Percentage of verified places + Days since verified %d change %d changes diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index 7b67739f..b02cec3c 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -33,7 +33,6 @@ Vérifier ou signaler DAB Icône de vérification - Fetching recent changes Base de données Dernière synchronisation: %1$s Base de données est vide @@ -45,7 +44,6 @@ Cafes Hotel Hotels - Other Other Pub Pubs @@ -65,6 +63,8 @@ Share unknown You\'ll need a companion app (%1$s) in order to make a payment. This app doesn\'t require you to fill any personal data, to the best of our knowledge. Please let us know if it\'s not the case and we\'ll remove this place. + Percentage of verified places + Days since verified %d modification %d modifications diff --git a/app/src/main/res/values-hi/strings.xml b/app/src/main/res/values-hi/strings.xml index 1745c38b..12dc7a74 100644 --- a/app/src/main/res/values-hi/strings.xml +++ b/app/src/main/res/values-hi/strings.xml @@ -33,7 +33,6 @@ Verify or Report ATM Checkmark icon - Fetching recent changes Database Updated: %1$s Database is empty @@ -45,7 +44,6 @@ Cafes Hotel Hotels - Other Other Pub Pubs @@ -65,6 +63,8 @@ Share unknown You\'ll need a companion app (%1$s) in order to make a payment. This app doesn\'t require you to fill any personal data, to the best of our knowledge. Please let us know if it\'s not the case and we\'ll remove this place. + Percentage of verified places + Days since verified %d change %d changes diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml index 1745c38b..12dc7a74 100644 --- a/app/src/main/res/values-hu/strings.xml +++ b/app/src/main/res/values-hu/strings.xml @@ -33,7 +33,6 @@ Verify or Report ATM Checkmark icon - Fetching recent changes Database Updated: %1$s Database is empty @@ -45,7 +44,6 @@ Cafes Hotel Hotels - Other Other Pub Pubs @@ -65,6 +63,8 @@ Share unknown You\'ll need a companion app (%1$s) in order to make a payment. This app doesn\'t require you to fill any personal data, to the best of our knowledge. Please let us know if it\'s not the case and we\'ll remove this place. + Percentage of verified places + Days since verified %d change %d changes diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index c803947e..aa45d8d0 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -33,7 +33,6 @@ Verify or Report ATM Checkmark icon - Fetching recent changes Database Updated: %1$s Database is empty @@ -45,7 +44,6 @@ Cafes Hotel Hotels - Other Other Pub Pubs @@ -65,6 +63,8 @@ Share unknown You\'ll need a companion app (%1$s) in order to make a payment. This app doesn\'t require you to fill any personal data, to the best of our knowledge. Please let us know if it\'s not the case and we\'ll remove this place. + Percentage of verified places + Days since verified %d change %d changes diff --git a/app/src/main/res/values-iw/strings.xml b/app/src/main/res/values-iw/strings.xml index f7e73bc5..4654f2e7 100644 --- a/app/src/main/res/values-iw/strings.xml +++ b/app/src/main/res/values-iw/strings.xml @@ -33,7 +33,6 @@ אמת או דווח כספומט סימן אישור - משיג שינויים אחרוניים בסיס מידע Updated: %1$s בסיס המידע רק @@ -45,7 +44,6 @@ בתי כפה מלון מלונות - אחר אחרי/ות פב פבים @@ -65,6 +63,8 @@ Share unknown You\'ll need a companion app (%1$s) in order to make a payment. This app doesn\'t require you to fill any personal data, to the best of our knowledge. Please let us know if it\'s not the case and we\'ll remove this place. + Percentage of verified places + Days since verified שינויים %d שינויים %d diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index d41f7206..1732540f 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -33,7 +33,6 @@ Verify or Report ATM Checkmark icon - Fetching recent changes Database Updated: %1$s Database is empty @@ -45,7 +44,6 @@ Cafes Hotel Hotels - Other Other Pub Pubs @@ -65,6 +63,8 @@ Share unknown You\'ll need a companion app (%1$s) in order to make a payment. This app doesn\'t require you to fill any personal data, to the best of our knowledge. Please let us know if it\'s not the case and we\'ll remove this place. + Percentage of verified places + Days since verified %d changes diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml index d41f7206..1732540f 100644 --- a/app/src/main/res/values-ko/strings.xml +++ b/app/src/main/res/values-ko/strings.xml @@ -33,7 +33,6 @@ Verify or Report ATM Checkmark icon - Fetching recent changes Database Updated: %1$s Database is empty @@ -45,7 +44,6 @@ Cafes Hotel Hotels - Other Other Pub Pubs @@ -65,6 +63,8 @@ Share unknown You\'ll need a companion app (%1$s) in order to make a payment. This app doesn\'t require you to fill any personal data, to the best of our knowledge. Please let us know if it\'s not the case and we\'ll remove this place. + Percentage of verified places + Days since verified %d changes diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index 1745c38b..12dc7a74 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -33,7 +33,6 @@ Verify or Report ATM Checkmark icon - Fetching recent changes Database Updated: %1$s Database is empty @@ -45,7 +44,6 @@ Cafes Hotel Hotels - Other Other Pub Pubs @@ -65,6 +63,8 @@ Share unknown You\'ll need a companion app (%1$s) in order to make a payment. This app doesn\'t require you to fill any personal data, to the best of our knowledge. Please let us know if it\'s not the case and we\'ll remove this place. + Percentage of verified places + Days since verified %d change %d changes diff --git a/app/src/main/res/values-no/strings.xml b/app/src/main/res/values-no/strings.xml index 1745c38b..12dc7a74 100644 --- a/app/src/main/res/values-no/strings.xml +++ b/app/src/main/res/values-no/strings.xml @@ -33,7 +33,6 @@ Verify or Report ATM Checkmark icon - Fetching recent changes Database Updated: %1$s Database is empty @@ -45,7 +44,6 @@ Cafes Hotel Hotels - Other Other Pub Pubs @@ -65,6 +63,8 @@ Share unknown You\'ll need a companion app (%1$s) in order to make a payment. This app doesn\'t require you to fill any personal data, to the best of our knowledge. Please let us know if it\'s not the case and we\'ll remove this place. + Percentage of verified places + Days since verified %d change %d changes diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml index 484380ab..95584816 100644 --- a/app/src/main/res/values-pl/strings.xml +++ b/app/src/main/res/values-pl/strings.xml @@ -33,7 +33,6 @@ Verify or Report ATM Checkmark icon - Fetching recent changes Database Updated: %1$s Database is empty @@ -45,7 +44,6 @@ Cafes Hotel Hotels - Other Other Pub Pubs @@ -65,6 +63,8 @@ Share unknown You\'ll need a companion app (%1$s) in order to make a payment. This app doesn\'t require you to fill any personal data, to the best of our knowledge. Please let us know if it\'s not the case and we\'ll remove this place. + Percentage of verified places + Days since verified %d change %d changes diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml index e4bae3cc..d711f302 100644 --- a/app/src/main/res/values-pt/strings.xml +++ b/app/src/main/res/values-pt/strings.xml @@ -33,7 +33,6 @@ Verificar ou reportar Caixa eletrônico Ícone de marca de seleção - Buscando mudanças recentes Banco de Dados Atualizado em: %1$s Banco de dado está vazio @@ -45,7 +44,6 @@ Cafés Hotel Hotéis - Outro Outros Pub Pubs @@ -65,6 +63,8 @@ Share unknown You\'ll need a companion app (%1$s) in order to make a payment. This app doesn\'t require you to fill any personal data, to the best of our knowledge. Please let us know if it\'s not the case and we\'ll remove this place. + Percentage of verified places + Days since verified %d mudança %d mudanças diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml index efd0c6d7..155a72fc 100644 --- a/app/src/main/res/values-ro/strings.xml +++ b/app/src/main/res/values-ro/strings.xml @@ -33,7 +33,6 @@ Verify or Report ATM Checkmark icon - Fetching recent changes Database Updated: %1$s Database is empty @@ -45,7 +44,6 @@ Cafes Hotel Hotels - Other Other Pub Pubs @@ -65,6 +63,8 @@ Share unknown You\'ll need a companion app (%1$s) in order to make a payment. This app doesn\'t require you to fill any personal data, to the best of our knowledge. Please let us know if it\'s not the case and we\'ll remove this place. + Percentage of verified places + Days since verified %d change %d changes diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index 62efc65e..78aa6d4a 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -33,7 +33,6 @@ Редактировать Банкомат Галочка - Загрузка последних изменений База данных Обновлена: %1$s База данных пуста @@ -45,7 +44,6 @@ Кафе Отель Отели - Другое Другое Паб Пабы @@ -65,6 +63,8 @@ Share unknown You\'ll need a companion app (%1$s) in order to make a payment. This app doesn\'t require you to fill any personal data, to the best of our knowledge. Please let us know if it\'s not the case and we\'ll remove this place. + Percentage of verified places + Days since verified %d правка %d правок diff --git a/app/src/main/res/values-sr/strings.xml b/app/src/main/res/values-sr/strings.xml index efd0c6d7..155a72fc 100644 --- a/app/src/main/res/values-sr/strings.xml +++ b/app/src/main/res/values-sr/strings.xml @@ -33,7 +33,6 @@ Verify or Report ATM Checkmark icon - Fetching recent changes Database Updated: %1$s Database is empty @@ -45,7 +44,6 @@ Cafes Hotel Hotels - Other Other Pub Pubs @@ -65,6 +63,8 @@ Share unknown You\'ll need a companion app (%1$s) in order to make a payment. This app doesn\'t require you to fill any personal data, to the best of our knowledge. Please let us know if it\'s not the case and we\'ll remove this place. + Percentage of verified places + Days since verified %d change %d changes diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml index 1745c38b..12dc7a74 100644 --- a/app/src/main/res/values-sv/strings.xml +++ b/app/src/main/res/values-sv/strings.xml @@ -33,7 +33,6 @@ Verify or Report ATM Checkmark icon - Fetching recent changes Database Updated: %1$s Database is empty @@ -45,7 +44,6 @@ Cafes Hotel Hotels - Other Other Pub Pubs @@ -65,6 +63,8 @@ Share unknown You\'ll need a companion app (%1$s) in order to make a payment. This app doesn\'t require you to fill any personal data, to the best of our knowledge. Please let us know if it\'s not the case and we\'ll remove this place. + Percentage of verified places + Days since verified %d change %d changes diff --git a/app/src/main/res/values-th/strings.xml b/app/src/main/res/values-th/strings.xml index d93d0e09..afe0a30e 100644 --- a/app/src/main/res/values-th/strings.xml +++ b/app/src/main/res/values-th/strings.xml @@ -33,7 +33,6 @@ ตรวจสอบหรือรายงาน ATM ไอคอนเครื่องหมายถูก - Fetching recent changes ฐานข้อมูล การซิงค์ครั้งล่าสุด: %1$s ฐานข้อมูลว่างเปล่า @@ -45,7 +44,6 @@ คาเฟ่ Hotel โรงแรม - Other อื่น Pub ผับ @@ -65,6 +63,8 @@ Share unknown You\'ll need a companion app (%1$s) in order to make a payment. This app doesn\'t require you to fill any personal data, to the best of our knowledge. Please let us know if it\'s not the case and we\'ll remove this place. + Percentage of verified places + Days since verified %d การเปลี่ยนแปลง diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml index 1c05b469..9452f32c 100644 --- a/app/src/main/res/values-tr/strings.xml +++ b/app/src/main/res/values-tr/strings.xml @@ -33,7 +33,6 @@ Doğrula veya Raporla ATM Onay işareti simgesi - Fetching recent changes Veri tabanı Son senkronizasyon: %1$s Veritabanı boş @@ -45,7 +44,6 @@ Cafes Hotel Hotels - Other Other Pub Pubs @@ -65,6 +63,8 @@ Share unknown You\'ll need a companion app (%1$s) in order to make a payment. This app doesn\'t require you to fill any personal data, to the best of our knowledge. Please let us know if it\'s not the case and we\'ll remove this place. + Percentage of verified places + Days since verified %d change %d changes diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml index 484380ab..95584816 100644 --- a/app/src/main/res/values-uk/strings.xml +++ b/app/src/main/res/values-uk/strings.xml @@ -33,7 +33,6 @@ Verify or Report ATM Checkmark icon - Fetching recent changes Database Updated: %1$s Database is empty @@ -45,7 +44,6 @@ Cafes Hotel Hotels - Other Other Pub Pubs @@ -65,6 +63,8 @@ Share unknown You\'ll need a companion app (%1$s) in order to make a payment. This app doesn\'t require you to fill any personal data, to the best of our knowledge. Please let us know if it\'s not the case and we\'ll remove this place. + Percentage of verified places + Days since verified %d change %d changes diff --git a/app/src/main/res/values-ur/strings.xml b/app/src/main/res/values-ur/strings.xml index 1745c38b..12dc7a74 100644 --- a/app/src/main/res/values-ur/strings.xml +++ b/app/src/main/res/values-ur/strings.xml @@ -33,7 +33,6 @@ Verify or Report ATM Checkmark icon - Fetching recent changes Database Updated: %1$s Database is empty @@ -45,7 +44,6 @@ Cafes Hotel Hotels - Other Other Pub Pubs @@ -65,6 +63,8 @@ Share unknown You\'ll need a companion app (%1$s) in order to make a payment. This app doesn\'t require you to fill any personal data, to the best of our knowledge. Please let us know if it\'s not the case and we\'ll remove this place. + Percentage of verified places + Days since verified %d change %d changes diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml index d41f7206..1732540f 100644 --- a/app/src/main/res/values-vi/strings.xml +++ b/app/src/main/res/values-vi/strings.xml @@ -33,7 +33,6 @@ Verify or Report ATM Checkmark icon - Fetching recent changes Database Updated: %1$s Database is empty @@ -45,7 +44,6 @@ Cafes Hotel Hotels - Other Other Pub Pubs @@ -65,6 +63,8 @@ Share unknown You\'ll need a companion app (%1$s) in order to make a payment. This app doesn\'t require you to fill any personal data, to the best of our knowledge. Please let us know if it\'s not the case and we\'ll remove this place. + Percentage of verified places + Days since verified %d changes diff --git a/app/src/main/res/values-zh/strings.xml b/app/src/main/res/values-zh/strings.xml index d41f7206..1732540f 100644 --- a/app/src/main/res/values-zh/strings.xml +++ b/app/src/main/res/values-zh/strings.xml @@ -33,7 +33,6 @@ Verify or Report ATM Checkmark icon - Fetching recent changes Database Updated: %1$s Database is empty @@ -45,7 +44,6 @@ Cafes Hotel Hotels - Other Other Pub Pubs @@ -65,6 +63,8 @@ Share unknown You\'ll need a companion app (%1$s) in order to make a payment. This app doesn\'t require you to fill any personal data, to the best of our knowledge. Please let us know if it\'s not the case and we\'ll remove this place. + Percentage of verified places + Days since verified %d changes diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index f64b7125..2c7c26e7 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -33,7 +33,6 @@ Verify or Report ATM Checkmark icon - Fetching recent changes Database Updated: %1$s Database is empty @@ -45,7 +44,6 @@ Cafes Hotel Hotels - Other Other Pub Pubs @@ -65,6 +63,8 @@ Share unknown You\'ll need a companion app (%1$s) in order to make a payment. This app doesn\'t require you to fill any personal data, to the best of our knowledge. Please let us know if it\'s not the case and we\'ll remove this place. + Percentage of verified places + Days since verified %d changes %d change diff --git a/app/src/main/res/xml/backup_rules.xml b/app/src/main/res/xml/backup_rules.xml new file mode 100644 index 00000000..54bea8e3 --- /dev/null +++ b/app/src/main/res/xml/backup_rules.xml @@ -0,0 +1,37 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 4fadef22..3220e922 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -17,7 +17,7 @@ constraintlayout = "2.1.4" preference = "1.2.1" # Material design components # https://github.com/material-components/material-components-android/releases -material = "1.11.0" +material = "1.12.0" # Modern HTTP client # https://github.com/square/okhttp/blob/master/CHANGELOG.md okhttp = "5.0.0-alpha.14"