tweaking some dialog UI

This commit is contained in:
tibbi
2021-11-19 16:42:37 +01:00
parent adac520044
commit dfd13c5286
12 changed files with 91 additions and 72 deletions

View File

@ -19,8 +19,7 @@ import com.simplemobiletools.commons.helpers.LICENSE_RTL
import com.simplemobiletools.commons.helpers.LICENSE_STETHO
import com.simplemobiletools.commons.helpers.ensureBackgroundThread
import com.simplemobiletools.commons.models.FAQItem
import kotlinx.android.synthetic.main.activity_main.main_tabs_holder
import kotlinx.android.synthetic.main.activity_main.view_pager
import kotlinx.android.synthetic.main.activity_main.*
class MainActivity : SimpleActivity() {
private var storedTextColor = 0
@ -72,10 +71,6 @@ class MainActivity : SimpleActivity() {
if (config.preventPhoneFromSleeping) {
window.clearFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON)
}
}
override fun onStop() {
super.onStop()
config.lastUsedViewPagerPage = view_pager.currentItem
}

View File

@ -31,7 +31,14 @@ class EditAlarmDialog(val activity: SimpleActivity, val alarm: Alarm, val callba
view.apply {
edit_alarm_time.setOnClickListener {
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()
}
edit_alarm_sound.colorCompoundDrawable(textColor)
@ -43,15 +50,15 @@ class EditAlarmDialog(val activity: SimpleActivity, val alarm: Alarm, val callba
updateSelectedAlarmSound(it)
}
}, onAlarmSoundDeleted = {
if (alarm.soundUri == it.uri) {
val defaultAlarm = context.getDefaultAlarmSound(RingtoneManager.TYPE_ALARM)
updateSelectedAlarmSound(defaultAlarm)
}
activity.checkAlarmsWithDeletedSoundUri(it.uri)
})
if (alarm.soundUri == it.uri) {
val defaultAlarm = context.getDefaultAlarmSound(RingtoneManager.TYPE_ALARM)
updateSelectedAlarmSound(defaultAlarm)
}
activity.checkAlarmsWithDeletedSoundUri(it.uri)
})
}
edit_alarm_vibrate.colorCompoundDrawable(textColor)
edit_alarm_vibrate_icon.setColorFilter(textColor)
edit_alarm_vibrate.isChecked = alarm.vibrate
edit_alarm_vibrate_holder.setOnClickListener {
edit_alarm_vibrate.toggle()

View File

@ -30,7 +30,7 @@ class EditTimerDialog(val activity: SimpleActivity, val timer: Timer, val callba
changeDuration(timer)
}
edit_timer_vibrate.colorCompoundDrawable(textColor)
edit_timer_vibrate_icon.setColorFilter(textColor)
edit_timer_vibrate.isChecked = timer.vibrate
edit_timer_vibrate.setTextColor(textColor)
edit_timer_vibrate_holder.setOnClickListener {
@ -72,7 +72,7 @@ class EditTimerDialog(val activity: SimpleActivity, val timer: Timer, val callba
activity.setupDialogStuff(view, this) {
getButton(AlertDialog.BUTTON_POSITIVE).setOnClickListener {
timer.label = view.edit_timer_label.value
activity.timerHelper.insertOrUpdateTimer(timer){
activity.timerHelper.insertOrUpdateTimer(timer) {
activity.config.timerLastConfig = timer
callback()
dismiss()
@ -101,8 +101,8 @@ class EditTimerDialog(val activity: SimpleActivity, val timer: Timer, val callba
private fun changeDuration(timer: Timer) {
MyTimePickerDialogDialog(activity, timer.seconds) { seconds ->
val timerSeconds = if (seconds <= 0) 10 else seconds
timer.seconds = timerSeconds
view.edit_timer_initial_time.text = timerSeconds.getFormattedDuration()
timer.seconds = timerSeconds
view.edit_timer_initial_time.text = timerSeconds.getFormattedDuration()
}
}