gronod/talk-android
1
0
Fork 1
mirror of https://github.com/nextcloud/talk-android synced 2025-06-20 12:09:45 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1004 from nextcloud/d538dependabot/gradle/com.afollestad.material-dialogs-datetime-3.3.0

Browse Source 
Bump material-dialogs from 3.1.0 to 3.3.0
This commit is contained in:
Andy Scherzinger 2021-04-27 21:41:23 +02:00 committed by GitHub
commit 3e3cf878a7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
app/build.gradle
View File

@ -147,6 +147,7 @@ ext {
daggerVersion = "2.34.1" daggerVersion = "2.34.1"
okhttpVersion = "3.14.2" okhttpVersion = "3.14.2"
lombokVersion = "1.18.10" lombokVersion = "1.18.10"
materialDialogsVersion = "3.3.0"
parcelerVersion = "1.1.13" parcelerVersion = "1.1.13"
powermockVersion = "2.0.9" powermockVersion = "2.0.9"
retrofit2Version = "2.7.1" retrofit2Version = "2.7.1"
@ -259,10 +260,10 @@ dependencies {
implementation 'com.amulyakhare:com.amulyakhare.textdrawable:1.0.1' implementation 'com.amulyakhare:com.amulyakhare.textdrawable:1.0.1'
implementation 'eu.medsea.mimeutil:mime-util:2.1.3' implementation 'eu.medsea.mimeutil:mime-util:2.1.3'
implementation 'com.afollestad.material-dialogs:core:3.1.0' implementation "com.afollestad.material-dialogs:core:${materialDialogsVersion}"
implementation 'com.afollestad.material-dialogs:datetime:3.1.0' implementation "com.afollestad.material-dialogs:datetime:${materialDialogsVersion}"
implementation 'com.afollestad.material-dialogs:bottomsheets:3.1.0' implementation "com.afollestad.material-dialogs:bottomsheets:${materialDialogsVersion}"
implementation 'com.afollestad.material-dialogs:lifecycle:3.1.0' implementation "com.afollestad.material-dialogs:lifecycle:${materialDialogsVersion}"
implementation 'com.google.code.gson:gson:2.8.6' implementation 'com.google.code.gson:gson:2.8.6'
implementation 'com.google.android.exoplayer:exoplayer:2.13.3' implementation 'com.google.android.exoplayer:exoplayer:2.13.3'

1
app/src/main/java/com/nextcloud/talk/controllers/ConversationInfoController.kt
View File

@ -254,6 +254,7 @@ class ConversationInfoController(args: Bundle) : BaseController(args), FlexibleA
requireFutureDateTime = requireFutureDateTime =
true, true,
currentDateTime = currentTimeCalendar, currentDateTime = currentTimeCalendar,
show24HoursView = true,
dateTimeCallback = { _, dateTimeCallback = { _,
dateTime -> dateTime ->
reconfigureLobbyTimerView(dateTime) reconfigureLobbyTimerView(dateTime)