diff --git a/app/src/main/kotlin/com/simplemobiletools/clock/dialogs/EditAlarmDialog.kt b/app/src/main/kotlin/com/simplemobiletools/clock/dialogs/EditAlarmDialog.kt index 0ef20a82..b569f577 100644 --- a/app/src/main/kotlin/com/simplemobiletools/clock/dialogs/EditAlarmDialog.kt +++ b/app/src/main/kotlin/com/simplemobiletools/clock/dialogs/EditAlarmDialog.kt @@ -34,7 +34,7 @@ class EditAlarmDialog(val activity: SimpleActivity, val alarm: Alarm, val callba TimePickerDialog(context, context.getDialogTheme(), timeSetListener, alarm.timeInMinutes / 60, alarm.timeInMinutes % 60, context.config.use24HourFormat).show() } - edit_alarm_sound.colorLeftDrawable(textColor) + edit_alarm_sound.colorCompoundDrawable(textColor) edit_alarm_sound.text = alarm.soundTitle edit_alarm_sound.setOnClickListener { SelectAlarmSoundDialog(activity, alarm.soundUri, AudioManager.STREAM_ALARM, PICK_AUDIO_FILE_INTENT_ID, RingtoneManager.TYPE_ALARM, true, @@ -51,7 +51,7 @@ class EditAlarmDialog(val activity: SimpleActivity, val alarm: Alarm, val callba }) } - edit_alarm_vibrate.colorLeftDrawable(textColor) + edit_alarm_vibrate.colorCompoundDrawable(textColor) edit_alarm_vibrate.isChecked = alarm.vibrate edit_alarm_vibrate_holder.setOnClickListener { edit_alarm_vibrate.toggle() diff --git a/app/src/main/kotlin/com/simplemobiletools/clock/dialogs/EditTimerDialog.kt b/app/src/main/kotlin/com/simplemobiletools/clock/dialogs/EditTimerDialog.kt index e2e9e89a..87d4d092 100644 --- a/app/src/main/kotlin/com/simplemobiletools/clock/dialogs/EditTimerDialog.kt +++ b/app/src/main/kotlin/com/simplemobiletools/clock/dialogs/EditTimerDialog.kt @@ -23,14 +23,14 @@ class EditTimerDialog(val activity: SimpleActivity, val timer: Timer, val callba view.apply { - edit_timer_initial_time.colorLeftDrawable(textColor) + edit_timer_initial_time.colorCompoundDrawable(textColor) edit_timer_initial_time.text = timer.seconds.getFormattedDuration() edit_timer_initial_time.setTextColor(textColor) edit_timer_initial_time.setOnClickListener { changeDuration(timer) } - edit_timer_vibrate.colorLeftDrawable(textColor) + edit_timer_vibrate.colorCompoundDrawable(textColor) edit_timer_vibrate.isChecked = timer.vibrate edit_timer_vibrate.setTextColor(textColor) edit_timer_vibrate_holder.setOnClickListener { @@ -39,7 +39,7 @@ class EditTimerDialog(val activity: SimpleActivity, val timer: Timer, val callba timer.channelId = null } - edit_timer_sound.colorLeftDrawable(textColor) + edit_timer_sound.colorCompoundDrawable(textColor) edit_timer_sound.text = timer.soundTitle edit_timer_sound.setOnClickListener { SelectAlarmSoundDialog(activity, timer.soundUri, AudioManager.STREAM_ALARM, PICK_AUDIO_FILE_INTENT_ID, diff --git a/app/src/main/kotlin/com/simplemobiletools/clock/extensions/TextView.kt b/app/src/main/kotlin/com/simplemobiletools/clock/extensions/TextView.kt index 27ea5c67..a85194aa 100644 --- a/app/src/main/kotlin/com/simplemobiletools/clock/extensions/TextView.kt +++ b/app/src/main/kotlin/com/simplemobiletools/clock/extensions/TextView.kt @@ -3,8 +3,9 @@ package com.simplemobiletools.clock.extensions import android.widget.TextView import com.simplemobiletools.commons.extensions.applyColorFilter -fun TextView.colorLeftDrawable(color: Int) { - val leftImage = compoundDrawables.first() - leftImage.applyColorFilter(color) - setCompoundDrawables(leftImage, null, null, null) +fun TextView.colorCompoundDrawable(color: Int) { + compoundDrawables.filterNotNull().forEach { drawable -> + drawable.applyColorFilter(color) + setCompoundDrawables(drawable, null, null, null) + } } diff --git a/app/src/main/kotlin/com/simplemobiletools/clock/fragments/ClockFragment.kt b/app/src/main/kotlin/com/simplemobiletools/clock/fragments/ClockFragment.kt index 0d2b1d8d..9648d2ff 100644 --- a/app/src/main/kotlin/com/simplemobiletools/clock/fragments/ClockFragment.kt +++ b/app/src/main/kotlin/com/simplemobiletools/clock/fragments/ClockFragment.kt @@ -112,7 +112,7 @@ class ClockFragment : Fragment() { val nextAlarm = requireContext().getNextAlarm() clock_alarm.beVisibleIf(nextAlarm.isNotEmpty()) clock_alarm.text = nextAlarm - clock_alarm.colorLeftDrawable(requireContext().config.textColor) + clock_alarm.colorCompoundDrawable(requireContext().config.textColor) } }