fenix/Simple-Calendar
1
0
Fork 0
mirror of https://github.com/SimpleMobileTools/Simple-Calendar.git synced 2025-03-03 19:09:07 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix crash related to color keys

Browse Source 
Color keys can be a name like 'aliceblue' or 'green'
This commit is contained in:
Naveen 2023-04-10 13:45:07 +05:30
parent 1a769df439
commit 22836dc71d
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
app/src/main/kotlin/com/simplemobiletools/calendar/pro/dialogs/SelectEventColorDialog.kt
View File

@ -20,15 +20,15 @@ class SelectEventColorDialog(val activity: Activity, val eventType: EventType, v
private var dialog: AlertDialog? = null
private val radioGroup: RadioGroup
private var wasInit = false
private val colors = activity.calDAVHelper.getAvailableCalDAVCalendarColors(eventType, Colors.TYPE_EVENT)
private val colors = activity.calDAVHelper.getAvailableCalDAVCalendarColors(eventType, Colors.TYPE_EVENT).keys
init {
val view = activity.layoutInflater.inflate(R.layout.dialog_select_event_color, null) as ViewGroup
radioGroup = view.dialog_select_event_type_color_radio
addRadioButton(colorKey = colors.values.size.inc(), color = eventType.color)
colors.forEach { (color, key) ->
addRadioButton(key.toInt(), color)
addRadioButton(index = colors.size.inc(), color = eventType.color)
colors.forEachIndexed { index, color ->
addRadioButton(index, color)
}
wasInit = true
@ -40,12 +40,12 @@ class SelectEventColorDialog(val activity: Activity, val eventType: EventType, v
}
}
private fun addRadioButton(colorKey: Int, color: Int) {
private fun addRadioButton(index: Int, color: Int) {
val view = activity.layoutInflater.inflate(R.layout.radio_button_with_color, null)
(view.dialog_radio_button as RadioButton).apply {
text = if (color == eventType.color) activity.getString(R.string.default_color) else String.format("#%06X", 0xFFFFFF and color)
isChecked = color == selectedColor
id = colorKey
id = index
}
view.dialog_radio_color.setFillWithStroke(color, activity.getProperBackgroundColor())