From b04cd541b453e2369526af96d955aacac28a0056 Mon Sep 17 00:00:00 2001 From: Mathieu Sanchez Date: Sat, 24 Oct 2020 17:33:03 +0200 Subject: [PATCH] Merge master in beta --- app/build.gradle | 2 -- .../java/fr/sanchezm/attestationsCovid19/ui/add/AddViewModel.kt | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index e446c1d..87d0652 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -82,9 +82,7 @@ dependencies { implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.2.0' implementation 'androidx.navigation:navigation-fragment-ktx:2.3.1' - implementation 'androidx.navigation:navigation-fragment:2.3.1' implementation 'androidx.navigation:navigation-ui-ktx:2.3.1' - implementation 'androidx.navigation:navigation-ui:2.3.1' // Design implementation 'com.google.android.material:material:1.2.1' diff --git a/app/src/main/java/fr/sanchezm/attestationsCovid19/ui/add/AddViewModel.kt b/app/src/main/java/fr/sanchezm/attestationsCovid19/ui/add/AddViewModel.kt index 6a0a60d..2aae1df 100644 --- a/app/src/main/java/fr/sanchezm/attestationsCovid19/ui/add/AddViewModel.kt +++ b/app/src/main/java/fr/sanchezm/attestationsCovid19/ui/add/AddViewModel.kt @@ -95,7 +95,7 @@ class AddViewModel( val dpd = DatePickerDialog( app, - DatePickerDialog.OnDateSetListener { _, yearPicked, monthOfYear, dayOfMonth -> + { _, yearPicked, monthOfYear, dayOfMonth -> birthday.value = "${getFormattedDayOrMonth(dayOfMonth)}/${getFormattedDayOrMonth(monthOfYear + 1)}/$yearPicked" },