fenix/Simple-Calendar
1
0
Fork 0
mirror of https://github.com/SimpleMobileTools/Simple-Calendar.git synced 2025-06-05 21:59:17 +02:00
Code Issues Packages Projects Releases Wiki Activity

use a negative repeatlimit for repeat count

Browse Source
This commit is contained in:
tibbi
2017-04-23 13:11:01 +02:00
parent 3fc9469dbb
commit b8d6c8c83c
1 changed files with 28 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
app/src/main/kotlin/com/simplemobiletools/calendar/dialogs/RepeatTypePickerDialog.kt
View File

@ -4,6 +4,7 @@ import android.annotation.SuppressLint
import android.app.Activity import android.app.Activity
import android.app.DatePickerDialog import android.app.DatePickerDialog
import android.support.v7.app.AlertDialog import android.support.v7.app.AlertDialog
import android.view.View
import com.simplemobiletools.calendar.R import com.simplemobiletools.calendar.R
import com.simplemobiletools.calendar.extensions.config import com.simplemobiletools.calendar.extensions.config
import com.simplemobiletools.calendar.extensions.getAppropriateTheme import com.simplemobiletools.calendar.extensions.getAppropriateTheme
@ -11,6 +12,7 @@ import com.simplemobiletools.calendar.extensions.seconds
import com.simplemobiletools.calendar.helpers.Formatter import com.simplemobiletools.calendar.helpers.Formatter
import com.simplemobiletools.commons.extensions.isLollipopPlus import com.simplemobiletools.commons.extensions.isLollipopPlus
import com.simplemobiletools.commons.extensions.setupDialogStuff import com.simplemobiletools.commons.extensions.setupDialogStuff
import com.simplemobiletools.commons.extensions.value
import kotlinx.android.synthetic.main.dialog_repeat_type_picker.view.* import kotlinx.android.synthetic.main.dialog_repeat_type_picker.view.*
import org.joda.time.DateTime import org.joda.time.DateTime
import java.util.* import java.util.*
@ -18,11 +20,16 @@ import java.util.*
class RepeatTypePickerDialog(val activity: Activity, var repeatLimit: Int, val startTS: Int, val callback: (repeatLimit: Int) -> Unit) : class RepeatTypePickerDialog(val activity: Activity, var repeatLimit: Int, val startTS: Int, val callback: (repeatLimit: Int) -> Unit) :
AlertDialog.Builder(activity) { AlertDialog.Builder(activity) {
lateinit var dialog: AlertDialog lateinit var dialog: AlertDialog
var view = activity.layoutInflater.inflate(R.layout.dialog_repeat_type_picker, null) var view: View
init { init {
view.repeat_type_date.setOnClickListener { showRepetitionLimitDialog() } view = activity.layoutInflater.inflate(R.layout.dialog_repeat_type_picker, null).apply {
view.repeat_type_forever.setOnClickListener { callback(0); dialog.dismiss() } repeat_type_date.setOnClickListener { showRepetitionLimitDialog() }
repeat_type_forever.setOnClickListener { callback(0); dialog.dismiss() }
repeat_type_count.setOnClickListener { dialog_radio_view.check(R.id.repeat_type_x_times) }
dialog_radio_view.check(getCheckedItem())
}
if (repeatLimit < startTS) if (repeatLimit < startTS)
repeatLimit = startTS repeatLimit = startTS
@ -37,6 +44,15 @@ class RepeatTypePickerDialog(val activity: Activity, var repeatLimit: Int, val s
} }
} }
private fun getCheckedItem(): Int {
return if (repeatLimit > 0)
R.id.repeat_type_till_date
else if (repeatLimit < 0)
R.id.repeat_type_count
else
R.id.repeat_type_forever
}
private fun updateRepeatLimitText() { private fun updateRepeatLimitText() {
if (repeatLimit == 0) if (repeatLimit == 0)
repeatLimit = (System.currentTimeMillis() / 1000).toInt() repeatLimit = (System.currentTimeMillis() / 1000).toInt()
@ -48,7 +64,15 @@ class RepeatTypePickerDialog(val activity: Activity, var repeatLimit: Int, val s
private fun confirmRepetition() { private fun confirmRepetition() {
when (view.dialog_radio_view.checkedRadioButtonId) { when (view.dialog_radio_view.checkedRadioButtonId) {
R.id.repeat_type_till_date -> callback(repeatLimit) R.id.repeat_type_till_date -> callback(repeatLimit)
else -> { } R.id.repeat_type_forever -> callback(0)
else -> {
var count = view.repeat_type_count.value
if (count.isEmpty())
count = "0"
else
count = "-$count"
callback(count.toInt())
}
} }
dialog.dismiss() dialog.dismiss()
} }