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

show the reminder types only at caldav synced events

Browse Source
This commit is contained in:
tibbi
2019-03-12 10:22:32 +01:00
parent 33e8f7ba6f
commit 92b49808ce
1 changed files with 14 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -154,21 +154,21 @@ class EventActivity : SimpleActivity() {
event_reminder_1_type.setOnClickListener { event_reminder_1_type.setOnClickListener {
showReminderTypePicker(mReminder1Type) { showReminderTypePicker(mReminder1Type) {
mReminder1Type = it mReminder1Type = it
updateReminderTypeImage(event_reminder_1_type, mReminder1Type) updateReminderTypeImage(event_reminder_1_type, mReminder1Minutes, mReminder1Type)
} }
} }
event_reminder_2_type.setOnClickListener { event_reminder_2_type.setOnClickListener {
showReminderTypePicker(mReminder2Type) { showReminderTypePicker(mReminder2Type) {
mReminder2Type = it mReminder2Type = it
updateReminderTypeImage(event_reminder_2_type, mReminder2Type) updateReminderTypeImage(event_reminder_2_type, mReminder2Minutes, mReminder2Type)
} }
} }
event_reminder_3_type.setOnClickListener { event_reminder_3_type.setOnClickListener {
showReminderTypePicker(mReminder3Type) { showReminderTypePicker(mReminder3Type) {
mReminder3Type = it mReminder3Type = it
updateReminderTypeImage(event_reminder_3_type, mReminder3Type) updateReminderTypeImage(event_reminder_3_type, mReminder3Minutes, mReminder3Type)
} }
} }
@@ -588,12 +588,11 @@ class EventActivity : SimpleActivity() {
updateReminder1Text() updateReminder1Text()
updateReminder2Text() updateReminder2Text()
updateReminder3Text() updateReminder3Text()
updateReminderTypeTexts() updateReminderTypeImages()
} }
private fun updateReminder1Text() { private fun updateReminder1Text() {
event_reminder_1.text = getFormattedMinutes(mReminder1Minutes) event_reminder_1.text = getFormattedMinutes(mReminder1Minutes)
event_reminder_1_type.beVisibleIf(mReminder1Minutes != REMINDER_OFF)
} }
private fun updateReminder2Text() { private fun updateReminder2Text() {
@@ -607,8 +606,6 @@ class EventActivity : SimpleActivity() {
alpha = 1f alpha = 1f
} }
} }
event_reminder_2_type.beVisibleIf(mReminder2Minutes != REMINDER_OFF)
} }
private fun updateReminder3Text() { private fun updateReminder3Text() {
@@ -622,8 +619,6 @@ class EventActivity : SimpleActivity() {
alpha = 1f alpha = 1f
} }
} }
event_reminder_3_type.beVisibleIf(mReminder3Minutes != REMINDER_OFF)
} }
private fun showReminderTypePicker(currentValue: Int, callback: (Int) -> Unit) { private fun showReminderTypePicker(currentValue: Int, callback: (Int) -> Unit) {
@@ -636,13 +631,14 @@ class EventActivity : SimpleActivity() {
} }
} }
private fun updateReminderTypeTexts() { private fun updateReminderTypeImages() {
updateReminderTypeImage(event_reminder_1_type, mReminder1Type) updateReminderTypeImage(event_reminder_1_type, mReminder1Minutes, mReminder1Type)
updateReminderTypeImage(event_reminder_2_type, mReminder2Type) updateReminderTypeImage(event_reminder_2_type, mReminder2Minutes, mReminder2Type)
updateReminderTypeImage(event_reminder_3_type, mReminder3Type) updateReminderTypeImage(event_reminder_3_type, mReminder3Minutes, mReminder3Type)
} }
private fun updateReminderTypeImage(view: ImageView, type: Int) { private fun updateReminderTypeImage(view: ImageView, minutes: Int, type: Int) {
view.beVisibleIf(minutes != REMINDER_OFF && mEventCalendarId != STORED_LOCALLY_ONLY)
val drawable = if (type == REMINDER_NOTIFICATION) R.drawable.ic_bell else R.drawable.ic_email val drawable = if (type == REMINDER_NOTIFICATION) R.drawable.ic_bell else R.drawable.ic_email
val icon = resources.getColoredDrawableWithColor(drawable, config.textColor) val icon = resources.getColoredDrawableWithColor(drawable, config.textColor)
view.setImageDrawable(icon) view.setImageDrawable(icon)
@@ -685,6 +681,7 @@ class EventActivity : SimpleActivity() {
mEventCalendarId = it mEventCalendarId = it
config.lastUsedCaldavCalendarId = it config.lastUsedCaldavCalendarId = it
updateCurrentCalendarInfo(getCalendarWithId(calendars, it)) updateCurrentCalendarInfo(getCalendarWithId(calendars, it))
updateReminderTypeImages()
} }
} }
} else { } else {
@@ -836,9 +833,9 @@ class EventActivity : SimpleActivity() {
val reminder3 = keys.getOrElse(2) { REMINDER_OFF } val reminder3 = keys.getOrElse(2) { REMINDER_OFF }
val types = sortedReminders.values.toList() val types = sortedReminders.values.toList()
mReminder1Type = types.getOrElse(0) { REMINDER_NOTIFICATION } mReminder1Type = if (mEventCalendarId == STORED_LOCALLY_ONLY) REMINDER_NOTIFICATION else types.getOrElse(0) { REMINDER_NOTIFICATION }
mReminder2Type = types.getOrElse(1) { REMINDER_NOTIFICATION } mReminder2Type = if (mEventCalendarId == STORED_LOCALLY_ONLY) REMINDER_NOTIFICATION else types.getOrElse(1) { REMINDER_NOTIFICATION }
mReminder3Type = types.getOrElse(2) { REMINDER_NOTIFICATION } mReminder3Type = if (mEventCalendarId == STORED_LOCALLY_ONLY) REMINDER_NOTIFICATION else types.getOrElse(2) { REMINDER_NOTIFICATION }
config.apply { config.apply {
if (usePreviousEventReminders) { if (usePreviousEventReminders) {