From fc777e388681c1cc3c1a34f1ac7f2abddd9e5920 Mon Sep 17 00:00:00 2001 From: tibbi Date: Tue, 27 Mar 2018 18:47:28 +0200 Subject: [PATCH] update commons to 3.17.3 --- app/build.gradle | 2 +- .../simplemobiletools/calendar/activities/EventActivity.kt | 6 +++--- .../calendar/activities/SettingsActivity.kt | 2 +- .../calendar/activities/SnoozeReminderActivity.kt | 4 ++-- build.gradle | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index d3f6071ea..a58103c20 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -46,7 +46,7 @@ ext { } dependencies { - implementation 'com.simplemobiletools:commons:3.16.17' + implementation 'com.simplemobiletools:commons:3.17.3' implementation 'joda-time:joda-time:2.9.9' implementation 'com.facebook.stetho:stetho:1.5.0' implementation 'com.android.support:multidex:1.0.3' diff --git a/app/src/main/kotlin/com/simplemobiletools/calendar/activities/EventActivity.kt b/app/src/main/kotlin/com/simplemobiletools/calendar/activities/EventActivity.kt index 96855c82c..7a3e6feeb 100644 --- a/app/src/main/kotlin/com/simplemobiletools/calendar/activities/EventActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/calendar/activities/EventActivity.kt @@ -174,21 +174,21 @@ class EventActivity : SimpleActivity() { } private fun showReminder1Dialog() { - showPickSecondsDialog(mReminder1Minutes * 60) { + showPickSecondsDialogHelper(mReminder1Minutes) { mReminder1Minutes = if (it <= 0) it else it / 60 checkReminderTexts() } } private fun showReminder2Dialog() { - showPickSecondsDialog(mReminder2Minutes * 60) { + showPickSecondsDialogHelper(mReminder2Minutes) { mReminder2Minutes = if (it <= 0) it else it / 60 checkReminderTexts() } } private fun showReminder3Dialog() { - showPickSecondsDialog(mReminder3Minutes * 60) { + showPickSecondsDialogHelper(mReminder3Minutes) { mReminder3Minutes = if (it <= 0) it else it / 60 checkReminderTexts() } diff --git a/app/src/main/kotlin/com/simplemobiletools/calendar/activities/SettingsActivity.kt b/app/src/main/kotlin/com/simplemobiletools/calendar/activities/SettingsActivity.kt index f1729d9fb..eae50e682 100644 --- a/app/src/main/kotlin/com/simplemobiletools/calendar/activities/SettingsActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/calendar/activities/SettingsActivity.kt @@ -319,7 +319,7 @@ class SettingsActivity : SimpleActivity() { private fun setupSnoozeTime() { updateSnoozeTime() settings_snooze_time_holder.setOnClickListener { - showPickSecondsDialog(config.snoozeTime * 60, true) { + showPickSecondsDialogHelper(config.snoozeTime, true) { config.snoozeTime = it / 60 updateSnoozeTime() } diff --git a/app/src/main/kotlin/com/simplemobiletools/calendar/activities/SnoozeReminderActivity.kt b/app/src/main/kotlin/com/simplemobiletools/calendar/activities/SnoozeReminderActivity.kt index ec05c36ee..455a6313d 100644 --- a/app/src/main/kotlin/com/simplemobiletools/calendar/activities/SnoozeReminderActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/calendar/activities/SnoozeReminderActivity.kt @@ -6,13 +6,13 @@ import com.simplemobiletools.calendar.extensions.config import com.simplemobiletools.calendar.extensions.dbHelper import com.simplemobiletools.calendar.extensions.rescheduleReminder import com.simplemobiletools.calendar.helpers.EVENT_ID -import com.simplemobiletools.commons.extensions.showPickSecondsDialog +import com.simplemobiletools.commons.extensions.showPickSecondsDialogHelper class SnoozeReminderActivity : AppCompatActivity() { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) - showPickSecondsDialog(config.snoozeTime * 60, true, cancelCallback = { dialogCancelled() }) { + showPickSecondsDialogHelper(config.snoozeTime, true, cancelCallback = { dialogCancelled() }) { val eventId = intent.getIntExtra(EVENT_ID, 0) val event = dbHelper.getEventWithId(eventId) config.snoozeTime = it / 60 diff --git a/build.gradle b/build.gradle index 584467619..e6abf43e1 100644 --- a/build.gradle +++ b/build.gradle @@ -9,7 +9,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:3.0.1' + classpath 'com.android.tools.build:gradle:3.1.0' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" // NOTE: Do not place your application dependencies here; they belong