fenix
/
Simple-Calendar
mirror of https://github.com/SimpleMobileTools/Simple-Calendar.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

update commons to 3.17.3

This commit is contained in:
tibbi 2018-03-27 18:47:28 +02:00
parent c619dc0e8a
commit fc777e3886
5 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/build.gradle
View File

@ -46,7 +46,7 @@ ext {
} }
dependencies { dependencies {
implementation 'com.simplemobiletools:commons:3.16.17' implementation 'com.simplemobiletools:commons:3.17.3'
implementation 'joda-time:joda-time:2.9.9' implementation 'joda-time:joda-time:2.9.9'
implementation 'com.facebook.stetho:stetho:1.5.0' implementation 'com.facebook.stetho:stetho:1.5.0'
implementation 'com.android.support:multidex:1.0.3' implementation 'com.android.support:multidex:1.0.3'

6
app/src/main/kotlin/com/simplemobiletools/calendar/activities/EventActivity.kt
View File

@ -174,21 +174,21 @@ class EventActivity : SimpleActivity() {
} }
private fun showReminder1Dialog() { private fun showReminder1Dialog() {
showPickSecondsDialog(mReminder1Minutes * 60) { showPickSecondsDialogHelper(mReminder1Minutes) {
mReminder1Minutes = if (it <= 0) it else it / 60 mReminder1Minutes = if (it <= 0) it else it / 60
checkReminderTexts() checkReminderTexts()
} }
} }
private fun showReminder2Dialog() { private fun showReminder2Dialog() {
showPickSecondsDialog(mReminder2Minutes * 60) { showPickSecondsDialogHelper(mReminder2Minutes) {
mReminder2Minutes = if (it <= 0) it else it / 60 mReminder2Minutes = if (it <= 0) it else it / 60
checkReminderTexts() checkReminderTexts()
} }
} }
private fun showReminder3Dialog() { private fun showReminder3Dialog() {
showPickSecondsDialog(mReminder3Minutes * 60) { showPickSecondsDialogHelper(mReminder3Minutes) {
mReminder3Minutes = if (it <= 0) it else it / 60 mReminder3Minutes = if (it <= 0) it else it / 60
checkReminderTexts() checkReminderTexts()
} }

2
app/src/main/kotlin/com/simplemobiletools/calendar/activities/SettingsActivity.kt
View File

@ -319,7 +319,7 @@ class SettingsActivity : SimpleActivity() {
private fun setupSnoozeTime() { private fun setupSnoozeTime() {
updateSnoozeTime() updateSnoozeTime()
settings_snooze_time_holder.setOnClickListener { settings_snooze_time_holder.setOnClickListener {
showPickSecondsDialog(config.snoozeTime * 60, true) { showPickSecondsDialogHelper(config.snoozeTime, true) {
config.snoozeTime = it / 60 config.snoozeTime = it / 60
updateSnoozeTime() updateSnoozeTime()
} }

4
app/src/main/kotlin/com/simplemobiletools/calendar/activities/SnoozeReminderActivity.kt
View File

@ -6,13 +6,13 @@ import com.simplemobiletools.calendar.extensions.config
import com.simplemobiletools.calendar.extensions.dbHelper import com.simplemobiletools.calendar.extensions.dbHelper
import com.simplemobiletools.calendar.extensions.rescheduleReminder import com.simplemobiletools.calendar.extensions.rescheduleReminder
import com.simplemobiletools.calendar.helpers.EVENT_ID import com.simplemobiletools.calendar.helpers.EVENT_ID
import com.simplemobiletools.commons.extensions.showPickSecondsDialog import com.simplemobiletools.commons.extensions.showPickSecondsDialogHelper
class SnoozeReminderActivity : AppCompatActivity() { class SnoozeReminderActivity : AppCompatActivity() {
override fun onCreate(savedInstanceState: Bundle?) { override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState) super.onCreate(savedInstanceState)
showPickSecondsDialog(config.snoozeTime * 60, true, cancelCallback = { dialogCancelled() }) { showPickSecondsDialogHelper(config.snoozeTime, true, cancelCallback = { dialogCancelled() }) {
val eventId = intent.getIntExtra(EVENT_ID, 0) val eventId = intent.getIntExtra(EVENT_ID, 0)
val event = dbHelper.getEventWithId(eventId) val event = dbHelper.getEventWithId(eventId)
config.snoozeTime = it / 60 config.snoozeTime = it / 60

2
build.gradle
View File

@ -9,7 +9,7 @@ buildscript {
} }
dependencies { 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" classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
// NOTE: Do not place your application dependencies here; they belong // NOTE: Do not place your application dependencies here; they belong