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

properly toggle day state at Edit Alarm dialog

This commit is contained in:
tibbi 2018-03-05 18:12:55 +01:00
parent 470bcdb68a
commit a60bf80785
2 changed files with 27 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/build.gradle
View File

@ -41,7 +41,7 @@ android {
} }
dependencies { dependencies {
implementation 'com.simplemobiletools:commons:3.14.17' implementation 'com.simplemobiletools:commons:3.14.18'
implementation 'com.facebook.stetho:stetho:1.5.0' implementation 'com.facebook.stetho:stetho:1.5.0'
implementation 'com.android.support.constraint:constraint-layout:1.0.2' implementation 'com.android.support.constraint:constraint-layout:1.0.2'
} }

39
app/src/main/kotlin/com/simplemobiletools/clock/dialogs/EditAlarmDialog.kt
View File

@ -1,6 +1,7 @@
package com.simplemobiletools.clock.dialogs package com.simplemobiletools.clock.dialogs
import android.app.TimePickerDialog import android.app.TimePickerDialog
import android.graphics.drawable.Drawable
import android.support.v7.app.AlertDialog import android.support.v7.app.AlertDialog
import android.widget.TextView import android.widget.TextView
import com.simplemobiletools.clock.R import com.simplemobiletools.clock.R
@ -8,17 +9,14 @@ import com.simplemobiletools.clock.activities.SimpleActivity
import com.simplemobiletools.clock.extensions.config import com.simplemobiletools.clock.extensions.config
import com.simplemobiletools.clock.extensions.formatAlarmTime import com.simplemobiletools.clock.extensions.formatAlarmTime
import com.simplemobiletools.clock.models.Alarm import com.simplemobiletools.clock.models.Alarm
import com.simplemobiletools.commons.extensions.applyColorFilter import com.simplemobiletools.commons.extensions.*
import com.simplemobiletools.commons.extensions.getDialogTheme
import com.simplemobiletools.commons.extensions.moveLastItemToFront
import com.simplemobiletools.commons.extensions.setupDialogStuff
import kotlinx.android.synthetic.main.dialog_edit_alarm.view.* import kotlinx.android.synthetic.main.dialog_edit_alarm.view.*
class EditAlarmDialog(val activity: SimpleActivity, val alarm: Alarm, val callback: () -> Unit) { class EditAlarmDialog(val activity: SimpleActivity, val alarm: Alarm, val callback: () -> Unit) {
val view = activity.layoutInflater.inflate(R.layout.dialog_edit_alarm, null) val view = activity.layoutInflater.inflate(R.layout.dialog_edit_alarm, null)
val textColor = activity.config.textColor
init { init {
val textColor = activity.config.textColor
updateAlarmTime() updateAlarmTime()
view.apply { view.apply {
@ -26,13 +24,13 @@ 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() TimePickerDialog(context, context.getDialogTheme(), timeSetListener, alarm.timeInMinutes / 60, alarm.timeInMinutes % 60, context.config.use24hourFormat).show()
} }
colorLeftDrawable(edit_alarm_sound, textColor) colorLeftDrawable(edit_alarm_sound)
edit_alarm_sound.text = "Default alarm" edit_alarm_sound.text = "Default alarm"
edit_alarm_sound.setOnClickListener { edit_alarm_sound.setOnClickListener {
} }
colorLeftDrawable(edit_alarm_vibrate, textColor) colorLeftDrawable(edit_alarm_vibrate)
edit_alarm_vibrate.isChecked = alarm.vibrate edit_alarm_vibrate.isChecked = alarm.vibrate
edit_alarm_vibrate_holder.setOnClickListener { edit_alarm_vibrate_holder.setOnClickListener {
edit_alarm_vibrate.toggle() edit_alarm_vibrate.toggle()
@ -51,12 +49,20 @@ class EditAlarmDialog(val activity: SimpleActivity, val alarm: Alarm, val callba
day.text = dayLetters[i] day.text = dayLetters[i]
val isDayChecked = alarm.days and pow != 0 val isDayChecked = alarm.days and pow != 0
val drawableId = if (isDayChecked) R.drawable.circle_background_filled else R.drawable.circle_background_stroke day.background = getProperDayDrawable(isDayChecked)
val drawable = activity.resources.getDrawable(drawableId)
drawable.applyColorFilter(textColor)
day.background = drawable
day.setTextColor(if (isDayChecked) context.config.backgroundColor else textColor) day.setTextColor(if (isDayChecked) context.config.backgroundColor else textColor)
day.setOnClickListener {
val selectDay = alarm.days and pow == 0
if (selectDay) {
alarm.days = alarm.days.addBit(pow)
} else {
alarm.days = alarm.days.removeBit(pow)
}
day.background = getProperDayDrawable(selectDay)
day.setTextColor(if (selectDay) context.config.backgroundColor else textColor)
}
edit_alarm_days_holder.addView(day) edit_alarm_days_holder.addView(day)
} }
} }
@ -84,9 +90,16 @@ class EditAlarmDialog(val activity: SimpleActivity, val alarm: Alarm, val callba
callback() callback()
} }
private fun colorLeftDrawable(textView: TextView, color: Int) { private fun colorLeftDrawable(textView: TextView) {
val leftImage = textView.compoundDrawables.first() val leftImage = textView.compoundDrawables.first()
leftImage.applyColorFilter(color) leftImage.applyColorFilter(textColor)
textView.setCompoundDrawables(leftImage, null, null, null) textView.setCompoundDrawables(leftImage, null, null, null)
} }
private fun getProperDayDrawable(selected: Boolean): Drawable {
val drawableId = if (selected) R.drawable.circle_background_filled else R.drawable.circle_background_stroke
val drawable = activity.resources.getDrawable(drawableId)
drawable.applyColorFilter(textColor)
return drawable
}
} }