From 3ee97b73021910a57bcabb47f65301b3032e7b56 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 21 Apr 2021 12:36:49 +0000 Subject: [PATCH 1/3] Bump datetime from 3.1.0 to 3.3.0 Bumps datetime from 3.1.0 to 3.3.0. Signed-off-by: dependabot[bot] --- app/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/build.gradle b/app/build.gradle index 7f9f495e1..949a04259 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -260,7 +260,7 @@ dependencies { implementation 'eu.medsea.mimeutil:mime-util:2.1.3' implementation 'com.afollestad.material-dialogs:core:3.1.0' - implementation 'com.afollestad.material-dialogs:datetime:3.1.0' + implementation 'com.afollestad.material-dialogs:datetime:3.3.0' implementation 'com.afollestad.material-dialogs:bottomsheets:3.1.0' implementation 'com.afollestad.material-dialogs:lifecycle:3.1.0' From 80e8e6024a1cbe12b4d9a0ef6b70bb4d8de04958 Mon Sep 17 00:00:00 2001 From: Andy Scherzinger Date: Wed, 21 Apr 2021 23:16:34 +0200 Subject: [PATCH 2/3] unify material dialogs version Signed-off-by: Andy Scherzinger --- app/build.gradle | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 949a04259..3f9412a79 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -147,6 +147,7 @@ ext { daggerVersion = "2.34.1" okhttpVersion = "3.14.2" lombokVersion = "1.18.10" + materialDialogsVersion = "3.3.0" parcelerVersion = "1.1.13" powermockVersion = "2.0.9" retrofit2Version = "2.7.1" @@ -259,10 +260,10 @@ dependencies { implementation 'com.amulyakhare:com.amulyakhare.textdrawable:1.0.1' implementation 'eu.medsea.mimeutil:mime-util:2.1.3' - implementation 'com.afollestad.material-dialogs:core:3.1.0' - implementation 'com.afollestad.material-dialogs:datetime:3.3.0' - implementation 'com.afollestad.material-dialogs:bottomsheets:3.1.0' - implementation 'com.afollestad.material-dialogs:lifecycle:3.1.0' + implementation "com.afollestad.material-dialogs:core:${materialDialogsVersion}" + implementation "com.afollestad.material-dialogs:datetime:${materialDialogsVersion}" + implementation "com.afollestad.material-dialogs:bottomsheets:${materialDialogsVersion}" + implementation "com.afollestad.material-dialogs:lifecycle:${materialDialogsVersion}" implementation 'com.google.code.gson:gson:2.8.6' implementation 'com.google.android.exoplayer:exoplayer:2.13.3' From 9e587a4385907d1e9d48fc430985deb915c65507 Mon Sep 17 00:00:00 2001 From: Andy Scherzinger Date: Thu, 22 Apr 2021 00:00:30 +0200 Subject: [PATCH 3/3] use 24h format Signed-off-by: Andy Scherzinger --- .../com/nextcloud/talk/controllers/ConversationInfoController.kt | 1 + 1 file changed, 1 insertion(+) diff --git a/app/src/main/java/com/nextcloud/talk/controllers/ConversationInfoController.kt b/app/src/main/java/com/nextcloud/talk/controllers/ConversationInfoController.kt index ac2d2f262..77a5e8465 100644 --- a/app/src/main/java/com/nextcloud/talk/controllers/ConversationInfoController.kt +++ b/app/src/main/java/com/nextcloud/talk/controllers/ConversationInfoController.kt @@ -254,6 +254,7 @@ class ConversationInfoController(args: Bundle) : BaseController(args), FlexibleA requireFutureDateTime = true, currentDateTime = currentTimeCalendar, + show24HoursView = true, dateTimeCallback = { _, dateTime -> reconfigureLobbyTimerView(dateTime)