Merge master in beta
This commit is contained in:
parent
055be5f968
commit
b04cd541b4
@ -82,9 +82,7 @@ dependencies {
|
|||||||
implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx: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-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-ktx:2.3.1'
|
||||||
implementation 'androidx.navigation:navigation-ui:2.3.1'
|
|
||||||
|
|
||||||
// Design
|
// Design
|
||||||
implementation 'com.google.android.material:material:1.2.1'
|
implementation 'com.google.android.material:material:1.2.1'
|
||||||
|
@ -95,7 +95,7 @@ class AddViewModel(
|
|||||||
|
|
||||||
val dpd = DatePickerDialog(
|
val dpd = DatePickerDialog(
|
||||||
app,
|
app,
|
||||||
DatePickerDialog.OnDateSetListener { _, yearPicked, monthOfYear, dayOfMonth ->
|
{ _, yearPicked, monthOfYear, dayOfMonth ->
|
||||||
birthday.value =
|
birthday.value =
|
||||||
"${getFormattedDayOrMonth(dayOfMonth)}/${getFormattedDayOrMonth(monthOfYear + 1)}/$yearPicked"
|
"${getFormattedDayOrMonth(dayOfMonth)}/${getFormattedDayOrMonth(monthOfYear + 1)}/$yearPicked"
|
||||||
},
|
},
|
||||||
|
Loading…
Reference in New Issue
Block a user