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

improving some settings related code

Browse Source
This commit is contained in:
tibbi
2019-02-13 14:29:51 +01:00
parent 26d708d3e3
commit 4daee3c3d8
1 changed files with 19 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
app/src/main/kotlin/com/simplemobiletools/calendar/pro/activities/SettingsActivity.kt
View File

@@ -553,47 +553,43 @@ class SettingsActivity : SimpleActivity() {
} }
private fun setupDefaultStartTime() { private fun setupDefaultStartTime() {
settings_set_default_start_time.text = getHoursString(config.defaultStartTime) updateDefaultStartTimeText()
if (config.defaultStartTime == -1) {
settings_set_default_start_time.text = "/"
}
settings_set_default_start_time_holder.setOnClickListener { settings_set_default_start_time_holder.setOnClickListener {
val items = ArrayList<RadioItem>() val items = ArrayList<RadioItem>()
items.add(RadioItem(-1, "/")) items.add(RadioItem(-1, getString(R.string.next_full_hour)))
(0..24).mapTo(items) { RadioItem(it, getHoursString(it)) } (0..24).mapTo(items) { RadioItem(it, getHoursString(it)) }
RadioGroupDialog(this@SettingsActivity, items, config.defaultStartTime) { RadioGroupDialog(this@SettingsActivity, items, config.defaultStartTime) {
config.defaultStartTime = it as Int config.defaultStartTime = it as Int
settings_set_default_start_time.text = getHoursString(it) updateDefaultStartTimeText()
if (it == -1) {
settings_set_default_start_time.text = "/"
} }
} }
} }
private fun updateDefaultStartTimeText() {
settings_set_default_start_time.text = getHoursString(config.defaultStartTime)
if (config.defaultStartTime == -1) {
settings_set_default_start_time.text = getString(R.string.next_full_hour)
}
} }
private fun setupDefaultDuration() { private fun setupDefaultDuration() {
var defaultDuration = config.defaultDuration updateDefaultDurationText()
updateDefaultDurationText(defaultDuration)
settings_set_default_duration_time_holder.setOnClickListener { settings_set_default_duration_time_holder.setOnClickListener {
CustomIntervalPickerDialog(this, defaultDuration * 60) { CustomIntervalPickerDialog(this, config.defaultDuration * 60) {
val result = it / 60 val result = it / 60
defaultDuration = result
config.defaultDuration = result config.defaultDuration = result
updateDefaultDurationText(result) updateDefaultDurationText()
} }
} }
} }
private fun updateDefaultDurationText(defaultDuration: Int) { private fun updateDefaultDurationText() {
settings_set_default_duration_time.text = getDefaultDurationText(defaultDuration) val duration = config.defaultDuration
} settings_set_default_duration_time.text = if (duration == 0) {
"0 ${getString(R.string.minutes_raw)}"
private fun getDefaultDurationText(defaultDuration: Int): String {
return if (defaultDuration == 0) {
"0 " + getString(R.string.minutes_raw)
} else { } else {
getFormattedMinutes(defaultDuration, false) getFormattedMinutes(duration, false)
} }
} }
} }