19 Commits

Author SHA1 Message Date
747cae4d04 Version2.1.1-beta1 versionCode 1007 2020-11-28 03:54:34 +01:00
3811723df6 Merge branch 'ms/issue-18/change_new_attestation' into beta 2020-11-28 03:52:44 +01:00
ba3956bd2f Merge branch 'ms/issues-17/add_buy_me_a_coffee' into beta 2020-11-27 22:33:00 +01:00
d5c140e9e5 Version 2.0.2-beta1 et versionCode 1006 2020-10-31 15:15:15 +01:00
b037788708 Merge branch 'ms/issues-17/add_buy_me_a_coffee' into beta
# Conflicts:
#	app/build.gradle
2020-10-31 15:07:24 +01:00
6983af93d7 Version 2.0.1-beta2 and versionCode 1005 2020-10-31 09:54:38 +01:00
ee9b243902 Merge remote-tracking branch 'origin/ms/issue-16/update_new_attestation' into beta 2020-10-31 09:51:33 +01:00
1530028f4b Version 2.0.1-beta1 version code 1004 2020-10-30 08:50:16 +01:00
20d41dec23 Merge branch 'ms/issue-16/update_new_attestation' into beta 2020-10-30 08:49:09 +01:00
b712c391ce Version 2.0.0-beta1 code 1003 2020-10-24 17:34:02 +02:00
b04cd541b4 Merge master in beta 2020-10-24 17:33:03 +02:00
055be5f968 Merge branch 'master' into beta
# Conflicts:
#	app/build.gradle
#	app/src/main/java/fr/sanchezm/attestationsCovid19/utilities/PdfUtils.kt
2020-10-24 17:23:06 +02:00
af6cef0cd4 Version 1.0.5-beta1 version code 1002 2020-05-02 15:47:23 +02:00
3b2bf5f0ae Merge branch 'ms/issue-14/adding-pickers' into beta
# Conflicts:
#	app/build.gradle
2020-05-02 15:46:43 +02:00
fac797ed32 Version 1.0.4-beta2 version code 1001 2020-05-02 14:47:57 +02:00
731920ca28 Merge branch 'ms/issue-4/add-credits-libraries-used' into beta 2020-05-02 14:46:45 +02:00
7d8c509e9c 1.0.4-beta1 version code 1000 2020-04-29 23:56:48 +02:00
50cd345a53 Merge pull request 'Adding config for alpha and beta build' (#12) from adding-config-alpha-beta into beta 2020-04-29 21:48:52 +00:00
8f965e5322 Merge pull request 'Adding credits and correct spelling mistake' (#10) from ms/issue-4/add-credits-libraries-used into beta 2020-04-29 21:46:11 +00:00
2 changed files with 4 additions and 6 deletions

View File

@ -15,8 +15,8 @@ android {
applicationId "fr.sanchezm.attestationsCovid19"
minSdkVersion 23
targetSdkVersion 30
versionCode 10
versionName "2.0.1"
versionCode 1007
versionName "2.1.1-beta1"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
}
@ -76,15 +76,13 @@ dependencies {
// Android X
implementation 'androidx.appcompat:appcompat:1.2.0'
implementation 'androidx.core:core-ktx:1.3.2'
implementation 'androidx.constraintlayout:constraintlayout:2.0.2'
implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
implementation 'androidx.legacy:legacy-support-v4:1.0.0'
implementation 'androidx.lifecycle:lifecycle-extensions:2.2.0'
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'

View File

@ -96,7 +96,7 @@ class AddViewModel(
val dpd = DatePickerDialog(
app,
DatePickerDialog.OnDateSetListener { _, yearPicked, monthOfYear, dayOfMonth ->
{ _, yearPicked, monthOfYear, dayOfMonth ->
birthday.value =
"${getFormattedDayOrMonth(dayOfMonth)}/${getFormattedDayOrMonth(monthOfYear + 1)}/$yearPicked"
},