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

fix #715, do not disable all reminders under the one which just got disabled

This commit is contained in:
tibbi 2018-12-03 11:35:43 +01:00
parent 29fe401c5f
commit 6ae1b80e2c
1 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -555,19 +555,14 @@ class EventActivity : SimpleActivity() {
private fun updateReminder1Text() { private fun updateReminder1Text() {
event_reminder_1.text = getFormattedMinutes(mReminder1Minutes) event_reminder_1.text = getFormattedMinutes(mReminder1Minutes)
if (mReminder1Minutes == REMINDER_OFF) {
mReminder2Minutes = REMINDER_OFF
mReminder3Minutes = REMINDER_OFF
}
} }
private fun updateReminder2Text() { private fun updateReminder2Text() {
event_reminder_2.apply { event_reminder_2.apply {
beGoneIf(mReminder1Minutes == REMINDER_OFF) beGoneIf(event_reminder_2.isGone() && mReminder1Minutes == REMINDER_OFF)
if (mReminder2Minutes == REMINDER_OFF) { if (mReminder2Minutes == REMINDER_OFF) {
text = resources.getString(R.string.add_another_reminder) text = resources.getString(R.string.add_another_reminder)
alpha = 0.4f alpha = 0.4f
mReminder3Minutes = REMINDER_OFF
} else { } else {
text = getFormattedMinutes(mReminder2Minutes) text = getFormattedMinutes(mReminder2Minutes)
alpha = 1f alpha = 1f
@ -577,7 +572,7 @@ class EventActivity : SimpleActivity() {
private fun updateReminder3Text() { private fun updateReminder3Text() {
event_reminder_3.apply { event_reminder_3.apply {
beGoneIf(mReminder2Minutes == REMINDER_OFF || mReminder1Minutes == REMINDER_OFF) beGoneIf(event_reminder_3.isGone() && (mReminder2Minutes == REMINDER_OFF || mReminder1Minutes == REMINDER_OFF))
if (mReminder3Minutes == REMINDER_OFF) { if (mReminder3Minutes == REMINDER_OFF) {
text = resources.getString(R.string.add_another_reminder) text = resources.getString(R.string.add_another_reminder)
alpha = 0.4f alpha = 0.4f