From fe45787582830c11bd1f0795a807d28d299dd65e Mon Sep 17 00:00:00 2001 From: Clea Benz Date: Tue, 31 Aug 2021 10:07:03 +0200 Subject: [PATCH 1/6] update dependencies --- build.gradle | 2 +- common/build.gradle | 14 +++++++------- verifier/build.gradle | 18 +++++++++--------- wallet/build.gradle | 18 +++++++++--------- 4 files changed, 26 insertions(+), 26 deletions(-) diff --git a/build.gradle b/build.gradle index a1c6eec6..c531edb5 100644 --- a/build.gradle +++ b/build.gradle @@ -10,7 +10,7 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. buildscript { - ext.kotlin_version = "1.4.31" + ext.kotlin_version = "1.5.30" repositories { google() mavenCentral() diff --git a/common/build.gradle b/common/build.gradle index 6340129e..e5bc1ee5 100644 --- a/common/build.gradle +++ b/common/build.gradle @@ -63,15 +63,15 @@ dependencies { api 'ch.admin.bag.covidcertificate:sdk-core:1.1.4' implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" - implementation 'androidx.core:core-ktx:1.3.2' - implementation 'androidx.appcompat:appcompat:1.2.0' - implementation 'androidx.fragment:fragment-ktx:1.3.3' - implementation 'com.google.android.material:material:1.3.0' + implementation 'androidx.core:core-ktx:1.6.0' + implementation 'androidx.appcompat:appcompat:1.3.1' + implementation 'androidx.fragment:fragment-ktx:1.3.6' + implementation 'com.google.android.material:material:1.4.0' implementation 'androidx.security:security-crypto:1.0.0' kapt 'com.squareup.moshi:moshi-kotlin-codegen:1.12.0' - api 'androidx.camera:camera-camera2:1.0.0' - api 'androidx.camera:camera-view:1.0.0-alpha25' - api 'androidx.camera:camera-lifecycle:1.0.0' + api 'androidx.camera:camera-camera2:1.0.1' + api 'androidx.camera:camera-view:1.0.0-alpha28' + api 'androidx.camera:camera-lifecycle:1.0.1' api "com.augustcellars.cose:cose-java:1.1.0" api 'org.bouncycastle:bcprov-jdk15on:1.69' diff --git a/verifier/build.gradle b/verifier/build.gradle index d7f494af..3a04fb16 100644 --- a/verifier/build.gradle +++ b/verifier/build.gradle @@ -114,15 +114,15 @@ sonarqube { dependencies { implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" - implementation 'com.google.android.material:material:1.3.0' + implementation 'com.google.android.material:material:1.4.0' implementation project(':common') coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.1.5' - implementation 'androidx.core:core-ktx:1.3.2' - implementation 'androidx.appcompat:appcompat:1.2.0' - implementation 'androidx.constraintlayout:constraintlayout:2.0.4' - implementation 'androidx.fragment:fragment-ktx:1.3.3' + implementation 'androidx.core:core-ktx:1.6.0' + implementation 'androidx.appcompat:appcompat:1.3.1' + implementation 'androidx.constraintlayout:constraintlayout:2.1.0' + implementation 'androidx.fragment:fragment-ktx:1.3.6' implementation 'androidx.lifecycle:lifecycle-extensions:2.2.0' implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.3.1' implementation "androidx.viewpager2:viewpager2:1.0.0" @@ -130,11 +130,11 @@ dependencies { implementation 'com.squareup.retrofit2:retrofit:2.9.0' implementation 'com.squareup.retrofit2:converter-moshi:2.9.0' - implementation 'com.squareup.okhttp3:logging-interceptor:4.7.2' + implementation 'com.squareup.okhttp3:logging-interceptor:4.9.0' implementation 'com.squareup.moshi:moshi:1.12.0' kapt "com.squareup.moshi:moshi-kotlin-codegen:1.12.0" - testImplementation 'junit:junit:4.+' - androidTestImplementation 'androidx.test.ext:junit:1.1.2' - androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0' + testImplementation 'junit:junit:4.13.2' + androidTestImplementation 'androidx.test.ext:junit:1.1.3' + androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0' } \ No newline at end of file diff --git a/wallet/build.gradle b/wallet/build.gradle index a7d54d25..7f8baf41 100644 --- a/wallet/build.gradle +++ b/wallet/build.gradle @@ -121,13 +121,13 @@ dependencies { coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.1.5' implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" - implementation 'com.google.android.material:material:1.3.0' + implementation 'com.google.android.material:material:1.4.0' implementation project(':common') - implementation 'androidx.core:core-ktx:1.3.2' - implementation 'androidx.appcompat:appcompat:1.2.0' - implementation 'androidx.constraintlayout:constraintlayout:2.0.4' - implementation 'androidx.fragment:fragment-ktx:1.3.3' + implementation 'androidx.core:core-ktx:1.6.0' + implementation 'androidx.appcompat:appcompat:1.3.1' + implementation 'androidx.constraintlayout:constraintlayout:2.1.0' + implementation 'androidx.fragment:fragment-ktx:1.3.6' implementation 'androidx.lifecycle:lifecycle-extensions:2.2.0' implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.3.1' implementation 'androidx.viewpager2:viewpager2:1.0.0' @@ -136,11 +136,11 @@ dependencies { implementation 'com.squareup.retrofit2:retrofit:2.9.0' implementation 'com.squareup.retrofit2:converter-moshi:2.9.0' - implementation 'com.squareup.okhttp3:logging-interceptor:4.7.2' + implementation 'com.squareup.okhttp3:logging-interceptor:4.9.0' implementation 'com.squareup.moshi:moshi:1.12.0' kapt 'com.squareup.moshi:moshi-kotlin-codegen:1.12.0' - testImplementation 'junit:junit:4.+' - androidTestImplementation 'androidx.test.ext:junit:1.1.2' - androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0' + testImplementation 'junit:junit:4.13.2' + androidTestImplementation 'androidx.test.ext:junit:1.1.3' + androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0' } \ No newline at end of file From cb6f8899e56cc9dad3d30bdaffaadcb93ca7bffe Mon Sep 17 00:00:00 2001 From: Clea Benz Date: Fri, 3 Sep 2021 08:39:58 +0200 Subject: [PATCH 2/6] poeditor update --- common/src/main/res/values-de/strings.xml | 5 +++++ common/src/main/res/values-fr/strings.xml | 6 ++++++ common/src/main/res/values-it/strings.xml | 6 ++++++ common/src/main/res/values-rm/strings.xml | 8 +++++++- common/src/main/res/values/strings.xml | 8 +++++++- 5 files changed, 31 insertions(+), 2 deletions(-) diff --git a/common/src/main/res/values-de/strings.xml b/common/src/main/res/values-de/strings.xml index 6ec9c53b..203e4735 100644 --- a/common/src/main/res/values-de/strings.xml +++ b/common/src/main/res/values-de/strings.xml @@ -938,6 +938,7 @@ erstellt werden" "nur muss keine" + "reduziert" @@ -1024,4 +1025,8 @@ Das «Zertifikat Light» ist lediglich elektronisch innerhalb der App verfügbar "Sprache" + + + + "Date format used: dd.mm.yyyy" \ No newline at end of file diff --git a/common/src/main/res/values-fr/strings.xml b/common/src/main/res/values-fr/strings.xml index 6ad9368f..a7ebecf7 100644 --- a/common/src/main/res/values-fr/strings.xml +++ b/common/src/main/res/values-fr/strings.xml @@ -906,9 +906,11 @@ et avec un document d’identité" "n’est utilisable qu’en doit être aucun" + "réduit" + "étendu" @@ -990,4 +992,8 @@ Le certificat light, reconnu uniquement en Suisse, n’est disponible que sous f "Langue" + + + + "Date format used: dd.mm.yyyy" \ No newline at end of file diff --git a/common/src/main/res/values-it/strings.xml b/common/src/main/res/values-it/strings.xml index bd0ca392..0db58fe7 100644 --- a/common/src/main/res/values-it/strings.xml +++ b/common/src/main/res/values-it/strings.xml @@ -911,9 +911,11 @@ con un documento di legittimazione" "solamente deve alcun" + "compressa" + "espansa" @@ -995,4 +997,8 @@ Il «certificato light» è disponibile unicamente in versione elettronica nell' "Lingua" + + + + "Date format used: dd.mm.yyyy" \ No newline at end of file diff --git a/common/src/main/res/values-rm/strings.xml b/common/src/main/res/values-rm/strings.xml index 997357c5..53ccf31b 100644 --- a/common/src/main/res/values-rm/strings.xml +++ b/common/src/main/res/values-rm/strings.xml @@ -50,7 +50,7 @@ "Agiuntar" - "Certificat covid" + "Certificat COVID" "Scannai il code QR sin il certificat COVID per al agiuntar a l'app." @@ -905,9 +905,11 @@ e mo en Svizra" "mo danovamain nagins" + "reducì" + "extendì" @@ -989,4 +991,8 @@ Il «certificat light» è disponibel mo en moda electronica entaifer l'app e ve "Lingua" + + + + "Date format used: dd.mm.yyyy" \ No newline at end of file diff --git a/common/src/main/res/values/strings.xml b/common/src/main/res/values/strings.xml index 6a5988ce..13a83a9a 100644 --- a/common/src/main/res/values/strings.xml +++ b/common/src/main/res/values/strings.xml @@ -766,7 +766,7 @@ invalid" However, in order to show whether your certificate meets Switzerland’s validity criteria and how long it is valid for, the COVID Certificate app has to be online at regular intervals." "What are the current validity criteria in Switzerland?" - "The current validity period of Covid certificates can be found here:" + "The current validity period of COVID certificates can be found here:" "Further information" "https://www.bag.admin.ch/bag/en/home/krankheiten/ausbrueche-epidemien-pandemien/aktuelle-ausbrueche-epidemien/novel-cov/covid-zertifikat.html#-837133624" "Is it possible to verify the certificates offline?" @@ -907,9 +907,11 @@ and in combination with an identity document" "only has to does not" + "reduced" + "expanded" @@ -991,4 +993,8 @@ The 'Certificate light' is only available electronically in the app and is only "Language" + + + + "Date format used: dd.mm.yyyy" \ No newline at end of file From 688aaa3c981d67963d7f047b410d97eda4ae8c95 Mon Sep 17 00:00:00 2001 From: Clea Benz Date: Fri, 3 Sep 2021 09:03:23 +0200 Subject: [PATCH 3/6] show date format --- common/build.gradle | 4 +- .../CertificateDetailItemListBuilder.kt | 182 +++++++++++------- 2 files changed, 115 insertions(+), 71 deletions(-) diff --git a/common/build.gradle b/common/build.gradle index aa217e67..f4b7efb3 100644 --- a/common/build.gradle +++ b/common/build.gradle @@ -62,8 +62,8 @@ android { dependencies { coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.1.5' - api 'ch.admin.bag.covidcertificate:sdk-android:1.3.1' - api 'ch.admin.bag.covidcertificate:sdk-core:1.1.4' + api 'ch.admin.bag.covidcertificate:sdk-android:1.4' + api 'ch.admin.bag.covidcertificate:sdk-core:2.0' implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" implementation 'androidx.core:core-ktx:1.6.0' diff --git a/wallet/src/main/java/ch/admin/bag/covidcertificate/wallet/detail/CertificateDetailItemListBuilder.kt b/wallet/src/main/java/ch/admin/bag/covidcertificate/wallet/detail/CertificateDetailItemListBuilder.kt index 14ed3976..ca9357a1 100644 --- a/wallet/src/main/java/ch/admin/bag/covidcertificate/wallet/detail/CertificateDetailItemListBuilder.kt +++ b/wallet/src/main/java/ch/admin/bag/covidcertificate/wallet/detail/CertificateDetailItemListBuilder.kt @@ -18,23 +18,16 @@ import ch.admin.bag.covidcertificate.sdk.android.extensions.DEFAULT_DISPLAY_DATE import ch.admin.bag.covidcertificate.sdk.android.extensions.DEFAULT_DISPLAY_DATE_TIME_FORMATTER import ch.admin.bag.covidcertificate.sdk.android.extensions.prettyPrint import ch.admin.bag.covidcertificate.sdk.android.extensions.prettyPrintIsoDateTime -import ch.admin.bag.covidcertificate.sdk.core.extensions.getCertificateIdentifier -import ch.admin.bag.covidcertificate.sdk.core.extensions.getFormattedResultDate -import ch.admin.bag.covidcertificate.sdk.core.extensions.getFormattedSampleDate -import ch.admin.bag.covidcertificate.sdk.core.extensions.getIssuer -import ch.admin.bag.covidcertificate.sdk.core.extensions.getNumberOverTotalDose -import ch.admin.bag.covidcertificate.sdk.core.extensions.getRecoveryCountry -import ch.admin.bag.covidcertificate.sdk.core.extensions.getTestCenter -import ch.admin.bag.covidcertificate.sdk.core.extensions.getTestCountry -import ch.admin.bag.covidcertificate.sdk.core.extensions.getVaccinationCountry -import ch.admin.bag.covidcertificate.sdk.core.extensions.isNegative -import ch.admin.bag.covidcertificate.sdk.core.extensions.isNotFullyProtected -import ch.admin.bag.covidcertificate.sdk.core.extensions.isTargetDiseaseCorrect +import ch.admin.bag.covidcertificate.sdk.core.extensions.* import ch.admin.bag.covidcertificate.sdk.core.models.healthcert.CertificateHolder import ch.admin.bag.covidcertificate.sdk.core.models.healthcert.eu.DccCert import ch.admin.bag.covidcertificate.wallet.R -class CertificateDetailItemListBuilder(val context: Context, val certificateHolder: CertificateHolder, val showEnglishVersion: Boolean = true) { +class CertificateDetailItemListBuilder( + val context: Context, + val certificateHolder: CertificateHolder, + val showEnglishVersion: Boolean = true +) { private val showEnglishVersionForLabels = showEnglishVersion && LocaleUtil.isSystemLangNotEnglish(context) fun buildAll(): List { @@ -66,24 +59,42 @@ class CertificateDetailItemListBuilder(val context: Context, val certificateHold for (vaccinationEntry in vaccinations) { detailItems.add(DividerItem) - detailItems.add(ValueItem(R.string.wallet_certificate_impfdosis_title, vaccinationEntry.getNumberOverTotalDose(), - showEnglishVersionForLabels)) + detailItems.add( + ValueItem( + R.string.wallet_certificate_impfdosis_title, vaccinationEntry.getNumberOverTotalDose(), + showEnglishVersionForLabels + ) + ) // Vaccine data if (vaccinationEntry.isTargetDiseaseCorrect()) { detailItems.add( - ValueItem(R.string.wallet_certificate_target_disease_title, + ValueItem( + R.string.wallet_certificate_target_disease_title, context.getString(R.string.target_disease_name), - showEnglishVersionForLabels) + showEnglishVersionForLabels + ) ) } val acceptedTestProvider = AcceptedVaccineProvider.getInstance(context) - detailItems.add(ValueItem(R.string.wallet_certificate_vaccine_prophylaxis, - acceptedTestProvider.getProphylaxis(vaccinationEntry), showEnglishVersionForLabels)) - detailItems.add(ValueItem(R.string.wallet_certificate_impfstoff_product_name_title, - acceptedTestProvider.getVaccineName(vaccinationEntry), showEnglishVersionForLabels)) - detailItems.add(ValueItem(R.string.wallet_certificate_impfstoff_holder, - acceptedTestProvider.getAuthHolder(vaccinationEntry), showEnglishVersionForLabels)) + detailItems.add( + ValueItem( + R.string.wallet_certificate_vaccine_prophylaxis, + acceptedTestProvider.getProphylaxis(vaccinationEntry), showEnglishVersionForLabels + ) + ) + detailItems.add( + ValueItem( + R.string.wallet_certificate_impfstoff_product_name_title, + acceptedTestProvider.getVaccineName(vaccinationEntry), showEnglishVersionForLabels + ) + ) + detailItems.add( + ValueItem( + R.string.wallet_certificate_impfstoff_holder, + acceptedTestProvider.getAuthHolder(vaccinationEntry), showEnglishVersionForLabels + ) + ) // Vaccination date + country detailItems.add(DividerItem) @@ -96,31 +107,34 @@ class CertificateDetailItemListBuilder(val context: Context, val certificateHold ) detailItems.add( - ValueItem(R.string.wallet_certificate_vaccination_country_title, + ValueItem( + R.string.wallet_certificate_vaccination_country_title, vaccinationEntry.getVaccinationCountry(showEnglishVersionForLabels), showEnglishVersionForLabels - )) + ) + ) // Issuer detailItems.add(DividerItem) - detailItems.add(ValueItem(R.string.wallet_certificate_vaccination_issuer_title, - vaccinationEntry.getIssuer(), showEnglishVersionForLabels)) - detailItems.add(ValueItem(R.string.wallet_certificate_identifier, - vaccinationEntry.getCertificateIdentifier(), - false)) + detailItems.add( + ValueItem( + R.string.wallet_certificate_vaccination_issuer_title, + vaccinationEntry.getIssuer(), showEnglishVersionForLabels + ) + ) + detailItems.add( + ValueItem( + R.string.wallet_certificate_identifier, + vaccinationEntry.getCertificateIdentifier(), + false + ) + ) var issuerText: Int = R.string.wallet_certificate_date if (vaccinationEntry.isNotFullyProtected()) { issuerText = R.string.wallet_certificate_evidence_creation_date } certificateHolder.issuedAt?.prettyPrint(DEFAULT_DISPLAY_DATE_TIME_FORMATTER)?.let { dateString -> - val dateText = context.getString(issuerText).replace("{DATE}", dateString) - detailItems.add(ValueItemWithoutLabel(dateText)) - if (showEnglishVersionForLabels) { - val dateTextEnglish = - getEnglishTranslation(context, issuerText).replace("{DATE}", dateString) - detailItems.add(ValueItemWithoutLabel(dateTextEnglish, true)) - } - + detailItems.addAll(getIssuedAtLabbels(issuerText, dateString)) } } return detailItems @@ -143,9 +157,11 @@ class CertificateDetailItemListBuilder(val context: Context, val certificateHold detailItems.add(DividerItem) if (recoveryEntry.isTargetDiseaseCorrect()) { detailItems.add( - ValueItem(R.string.wallet_certificate_target_disease_title, + ValueItem( + R.string.wallet_certificate_target_disease_title, context.getString(R.string.target_disease_name), - showEnglishVersionForLabels) + showEnglishVersionForLabels + ) ) } @@ -158,24 +174,26 @@ class CertificateDetailItemListBuilder(val context: Context, val certificateHold ) ) - detailItems.add(ValueItem(R.string.wallet_certificate_test_land, - recoveryEntry.getRecoveryCountry(showEnglishVersionForLabels), showEnglishVersionForLabels)) + detailItems.add( + ValueItem( + R.string.wallet_certificate_test_land, + recoveryEntry.getRecoveryCountry(showEnglishVersionForLabels), showEnglishVersionForLabels + ) + ) // Issuer detailItems.add(DividerItem) - detailItems.add(ValueItem(R.string.wallet_certificate_vaccination_issuer_title, - recoveryEntry.getIssuer(), - showEnglishVersionForLabels)) + detailItems.add( + ValueItem( + R.string.wallet_certificate_vaccination_issuer_title, + recoveryEntry.getIssuer(), + showEnglishVersionForLabels + ) + ) detailItems.add(ValueItem(R.string.wallet_certificate_identifier, recoveryEntry.getCertificateIdentifier(), false)) certificateHolder.issuedAt?.prettyPrint(DEFAULT_DISPLAY_DATE_TIME_FORMATTER)?.let { dateString -> - val dateText = context.getString(R.string.wallet_certificate_date).replace("{DATE}", dateString) - detailItems.add(ValueItemWithoutLabel(dateText)) - if (showEnglishVersionForLabels) { - val dateTextEnglish = - getEnglishTranslation(context, R.string.wallet_certificate_date).replace("{DATE}", dateString) - detailItems.add(ValueItemWithoutLabel(dateTextEnglish, true)) - } + detailItems.addAll(getIssuedAtLabbels(R.string.wallet_certificate_date, dateString)) } } return detailItems @@ -200,9 +218,11 @@ class CertificateDetailItemListBuilder(val context: Context, val certificateHold // Test result if (testEntry.isTargetDiseaseCorrect()) { detailItems.add( - ValueItem(R.string.wallet_certificate_target_disease_title, + ValueItem( + R.string.wallet_certificate_target_disease_title, context.getString(R.string.target_disease_name), - showEnglishVersionForLabels) + showEnglishVersionForLabels + ) ) } @@ -216,9 +236,13 @@ class CertificateDetailItemListBuilder(val context: Context, val certificateHold // Test details val acceptedTestProvider = AcceptedTestProvider.getInstance(context) - detailItems.add(ValueItem(R.string.wallet_certificate_test_type, - acceptedTestProvider.getTestType(testEntry), - showEnglishVersionForLabels)) + detailItems.add( + ValueItem( + R.string.wallet_certificate_test_type, + acceptedTestProvider.getTestType(testEntry), + showEnglishVersionForLabels + ) + ) acceptedTestProvider.getTestName(testEntry)?.let { detailItems.add(ValueItem(R.string.wallet_certificate_test_name, it, showEnglishVersionForLabels)) } @@ -250,27 +274,47 @@ class CertificateDetailItemListBuilder(val context: Context, val certificateHold testEntry.getTestCenter()?.let { testCenter -> detailItems.add(ValueItem(R.string.wallet_certificate_test_done_by, testCenter, showEnglishVersionForLabels)) } - detailItems.add(ValueItem(R.string.wallet_certificate_test_land, - testEntry.getTestCountry(showEnglishVersionForLabels), showEnglishVersionForLabels)) + detailItems.add( + ValueItem( + R.string.wallet_certificate_test_land, + testEntry.getTestCountry(showEnglishVersionForLabels), showEnglishVersionForLabels + ) + ) // Issuer detailItems.add(DividerItem) - detailItems.add(ValueItem(R.string.wallet_certificate_vaccination_issuer_title, - testEntry.getIssuer(), - showEnglishVersionForLabels)) + detailItems.add( + ValueItem( + R.string.wallet_certificate_vaccination_issuer_title, + testEntry.getIssuer(), + showEnglishVersionForLabels + ) + ) detailItems.add(ValueItem(R.string.wallet_certificate_identifier, testEntry.getCertificateIdentifier(), false)) certificateHolder.issuedAt?.prettyPrint(DEFAULT_DISPLAY_DATE_TIME_FORMATTER)?.let { dateString -> - val dateText = context.getString(R.string.wallet_certificate_date).replace("{DATE}", dateString) - detailItems.add(ValueItemWithoutLabel(dateText)) - if (showEnglishVersionForLabels) { - val dateTextEnglish = - getEnglishTranslation(context, R.string.wallet_certificate_date).replace("{DATE}", dateString) - detailItems.add(ValueItemWithoutLabel(dateTextEnglish, true)) - } + detailItems.addAll(getIssuedAtLabbels(R.string.wallet_certificate_date, dateString)) } } return detailItems } + private fun getIssuedAtLabbels(issuerText: Int, dateString: String): List { + val items = arrayListOf() + val dateText = context.getString(issuerText).replace("{DATE}", dateString) + items.add(ValueItemWithoutLabel(dateText)) + if (showEnglishVersionForLabels) { + val dateTextEnglish = + getEnglishTranslation(context, issuerText).replace("{DATE}", dateString) + items.add(ValueItemWithoutLabel(dateTextEnglish, true)) + } + items.add( + ValueItemWithoutLabel( + context.getString(R.string.wallet_certificate_detail_date_format_info), + showEnglishVersionForLabels + ) + ) + return items + } + } \ No newline at end of file From d29de4feb00181be039f354c92c16e29d9ed132d Mon Sep 17 00:00:00 2001 From: Clea Benz Date: Fri, 3 Sep 2021 18:55:47 +0200 Subject: [PATCH 4/6] poeditor update --- common/src/main/res/values-de/strings.xml | 2 +- common/src/main/res/values-fr/strings.xml | 2 +- common/src/main/res/values-it/strings.xml | 2 +- common/src/main/res/values-rm/strings.xml | 2 +- common/src/main/res/values/strings.xml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/common/src/main/res/values-de/strings.xml b/common/src/main/res/values-de/strings.xml index 203e4735..c357a2d2 100644 --- a/common/src/main/res/values-de/strings.xml +++ b/common/src/main/res/values-de/strings.xml @@ -409,7 +409,7 @@ Schweiz" "Positiv" "Typ" "Name" - "Hersteller" + "Hersteller/ Name" "Datum der Probenentnahme" "Datum Resultat" diff --git a/common/src/main/res/values-fr/strings.xml b/common/src/main/res/values-fr/strings.xml index a7ebecf7..40971d49 100644 --- a/common/src/main/res/values-fr/strings.xml +++ b/common/src/main/res/values-fr/strings.xml @@ -407,7 +407,7 @@ Suisse" "Positif" "Type" "Nom" - "Fabricant" + "Fabricant/ Nom" "Date du prélèvement de l'échantillon" "Date du résultat" diff --git a/common/src/main/res/values-it/strings.xml b/common/src/main/res/values-it/strings.xml index 0db58fe7..49ab5722 100644 --- a/common/src/main/res/values-it/strings.xml +++ b/common/src/main/res/values-it/strings.xml @@ -409,7 +409,7 @@ Svizzera" "Positivo" "Tipo" "Nome" - "Fabbricante" + "Fabbricante/ Nome" "Data del prelievo del campione" "Data del risultato" diff --git a/common/src/main/res/values-rm/strings.xml b/common/src/main/res/values-rm/strings.xml index 53ccf31b..9f72583c 100644 --- a/common/src/main/res/values-rm/strings.xml +++ b/common/src/main/res/values-rm/strings.xml @@ -405,7 +405,7 @@ signatura nunvalaivla" "Positiv" "Tip" "Num" - "Producent" + "Producent/ Num" "Data da l'emprova" "Data da resultat" diff --git a/common/src/main/res/values/strings.xml b/common/src/main/res/values/strings.xml index 13a83a9a..12c31617 100644 --- a/common/src/main/res/values/strings.xml +++ b/common/src/main/res/values/strings.xml @@ -408,7 +408,7 @@ Switzerland" "Positive" "Type" "Name" - "Manufacturer" + "Manufacturer/ Name" "Date of sample collection" "Result date" From 7f164dfa921219ba8fdf579ae4dd4ad050735a75 Mon Sep 17 00:00:00 2001 From: Clea Benz Date: Fri, 3 Sep 2021 19:01:01 +0200 Subject: [PATCH 5/6] poeditor --- common/src/main/res/values-de/strings.xml | 3 ++- common/src/main/res/values-fr/strings.xml | 3 ++- common/src/main/res/values-it/strings.xml | 3 ++- common/src/main/res/values-rm/strings.xml | 3 ++- common/src/main/res/values/strings.xml | 3 ++- 5 files changed, 10 insertions(+), 5 deletions(-) diff --git a/common/src/main/res/values-de/strings.xml b/common/src/main/res/values-de/strings.xml index c357a2d2..14483d58 100644 --- a/common/src/main/res/values-de/strings.xml +++ b/common/src/main/res/values-de/strings.xml @@ -409,7 +409,7 @@ Schweiz" "Positiv" "Typ" "Name" - "Hersteller/ Name" + "Hersteller" "Datum der Probenentnahme" "Datum Resultat" @@ -1029,4 +1029,5 @@ Das «Zertifikat Light» ist lediglich elektronisch innerhalb der App verfügbar "Date format used: dd.mm.yyyy" + "Hersteller/ Name" \ No newline at end of file diff --git a/common/src/main/res/values-fr/strings.xml b/common/src/main/res/values-fr/strings.xml index 40971d49..eba47ce3 100644 --- a/common/src/main/res/values-fr/strings.xml +++ b/common/src/main/res/values-fr/strings.xml @@ -407,7 +407,7 @@ Suisse" "Positif" "Type" "Nom" - "Fabricant/ Nom" + "Fabricant" "Date du prélèvement de l'échantillon" "Date du résultat" @@ -996,4 +996,5 @@ Le certificat light, reconnu uniquement en Suisse, n’est disponible que sous f "Date format used: dd.mm.yyyy" + "Fabricant/ Nom" \ No newline at end of file diff --git a/common/src/main/res/values-it/strings.xml b/common/src/main/res/values-it/strings.xml index 49ab5722..f230fec4 100644 --- a/common/src/main/res/values-it/strings.xml +++ b/common/src/main/res/values-it/strings.xml @@ -409,7 +409,7 @@ Svizzera" "Positivo" "Tipo" "Nome" - "Fabbricante/ Nome" + "Fabbricante" "Data del prelievo del campione" "Data del risultato" @@ -1001,4 +1001,5 @@ Il «certificato light» è disponibile unicamente in versione elettronica nell' "Date format used: dd.mm.yyyy" + "Fabbricante/ Nome" \ No newline at end of file diff --git a/common/src/main/res/values-rm/strings.xml b/common/src/main/res/values-rm/strings.xml index 9f72583c..6df09077 100644 --- a/common/src/main/res/values-rm/strings.xml +++ b/common/src/main/res/values-rm/strings.xml @@ -405,7 +405,7 @@ signatura nunvalaivla" "Positiv" "Tip" "Num" - "Producent/ Num" + "Producent" "Data da l'emprova" "Data da resultat" @@ -995,4 +995,5 @@ Il «certificat light» è disponibel mo en moda electronica entaifer l'app e ve "Date format used: dd.mm.yyyy" + "Producent/ Num" \ No newline at end of file diff --git a/common/src/main/res/values/strings.xml b/common/src/main/res/values/strings.xml index 12c31617..c30c6eed 100644 --- a/common/src/main/res/values/strings.xml +++ b/common/src/main/res/values/strings.xml @@ -408,7 +408,7 @@ Switzerland" "Positive" "Type" "Name" - "Manufacturer/ Name" + "Manufacturer" "Date of sample collection" "Result date" @@ -997,4 +997,5 @@ The 'Certificate light' is only available electronically in the app and is only "Date format used: dd.mm.yyyy" + "Manufacturer/ Name" \ No newline at end of file From 4d56033b781617046019edd80adbdd9807c588b6 Mon Sep 17 00:00:00 2001 From: Clea Benz Date: Mon, 6 Sep 2021 16:06:30 +0200 Subject: [PATCH 6/6] dependencies and new sdk version --- common/build.gradle | 2 +- verifier/build.gradle | 4 ++-- wallet/build.gradle | 4 ++-- .../wallet/detail/CertificateDetailItemListBuilder.kt | 8 +++----- 4 files changed, 8 insertions(+), 10 deletions(-) diff --git a/common/build.gradle b/common/build.gradle index f4b7efb3..61c8d5d6 100644 --- a/common/build.gradle +++ b/common/build.gradle @@ -62,7 +62,7 @@ android { dependencies { coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.1.5' - api 'ch.admin.bag.covidcertificate:sdk-android:1.4' + api 'ch.admin.bag.covidcertificate:sdk-android:1.5' api 'ch.admin.bag.covidcertificate:sdk-core:2.0' implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" diff --git a/verifier/build.gradle b/verifier/build.gradle index 2f93ac04..28e4be99 100644 --- a/verifier/build.gradle +++ b/verifier/build.gradle @@ -40,8 +40,8 @@ android { applicationId "ch.admin.bag.covidcertificate.verifier" minSdkVersion 23 targetSdkVersion 30 - versionCode 2400 - versionName "2.4.0" + versionCode 2500 + versionName "2.5.0" // Stops the Gradle plugin’s automatic rasterization of vectors generatedDensities = [] diff --git a/wallet/build.gradle b/wallet/build.gradle index bf9b53d8..6e304816 100644 --- a/wallet/build.gradle +++ b/wallet/build.gradle @@ -40,8 +40,8 @@ android { applicationId "ch.admin.bag.covidcertificate.wallet" minSdkVersion 23 targetSdkVersion 30 - versionCode 2400 - versionName "2.4.0" + versionCode 2500 + versionName "2.5.0" // Stops the Gradle plugin’s automatic rasterization of vectors generatedDensities = [] diff --git a/wallet/src/main/java/ch/admin/bag/covidcertificate/wallet/detail/CertificateDetailItemListBuilder.kt b/wallet/src/main/java/ch/admin/bag/covidcertificate/wallet/detail/CertificateDetailItemListBuilder.kt index ca9357a1..1f1433a8 100644 --- a/wallet/src/main/java/ch/admin/bag/covidcertificate/wallet/detail/CertificateDetailItemListBuilder.kt +++ b/wallet/src/main/java/ch/admin/bag/covidcertificate/wallet/detail/CertificateDetailItemListBuilder.kt @@ -243,11 +243,9 @@ class CertificateDetailItemListBuilder( showEnglishVersionForLabels ) ) - acceptedTestProvider.getTestName(testEntry)?.let { - detailItems.add(ValueItem(R.string.wallet_certificate_test_name, it, showEnglishVersionForLabels)) - } - acceptedTestProvider.getManufacturesIfExists(testEntry)?.let { - detailItems.add(ValueItem(R.string.wallet_certificate_test_holder, it, showEnglishVersionForLabels)) + + acceptedTestProvider.getManufacturesAndNameLabelIfExists(testEntry)?.let { + detailItems.add(ValueItem(R.string.wallet_certificate_test_holder_and_name, it, showEnglishVersionForLabels)) } // Test dates + country