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

use a constant at handling the default start time

Browse Source
This commit is contained in:
tibbi
2021-04-14 22:41:41 +02:00
parent 40783684db
commit 42135f9b5b
3 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -572,13 +572,13 @@ class SettingsActivity : SimpleActivity() {
private fun setupDefaultStartTime() { private fun setupDefaultStartTime() {
updateDefaultStartTimeText() updateDefaultStartTimeText()
settings_default_start_time_holder.setOnClickListener { settings_default_start_time_holder.setOnClickListener {
val currentDefaultTime = if (config.defaultStartTime == -1) -1 else 0 val currentDefaultTime = if (config.defaultStartTime == DEFAULT_START_TIME_NEXT_FULL_HOUR) DEFAULT_START_TIME_NEXT_FULL_HOUR else 0
val items = ArrayList<RadioItem>() val items = ArrayList<RadioItem>()
items.add(RadioItem(-1, getString(R.string.next_full_hour))) items.add(RadioItem(DEFAULT_START_TIME_NEXT_FULL_HOUR, getString(R.string.next_full_hour)))
items.add(RadioItem(0, getString(R.string.other_time))) items.add(RadioItem(0, getString(R.string.other_time)))
RadioGroupDialog(this@SettingsActivity, items, currentDefaultTime) { RadioGroupDialog(this@SettingsActivity, items, currentDefaultTime) {
if (it as Int == -1) { if (it as Int == DEFAULT_START_TIME_NEXT_FULL_HOUR) {
config.defaultStartTime = it config.defaultStartTime = it
updateDefaultStartTimeText() updateDefaultStartTimeText()
} else { } else {
@@ -595,7 +595,7 @@ class SettingsActivity : SimpleActivity() {
} }
private fun updateDefaultStartTimeText() { private fun updateDefaultStartTimeText() {
if (config.defaultStartTime == -1) { if (config.defaultStartTime == DEFAULT_START_TIME_NEXT_FULL_HOUR) {
settings_default_start_time.text = getString(R.string.next_full_hour) settings_default_start_time.text = getString(R.string.next_full_hour)
} else { } else {
val hours = config.defaultStartTime / 60 val hours = config.defaultStartTime / 60

2
app/src/main/kotlin/com/simplemobiletools/calendar/pro/helpers/Config.kt
View File

@@ -155,7 +155,7 @@ class Config(context: Context) : BaseConfig(context) {
set(lastVibrateOnReminder) = prefs.edit().putBoolean(LAST_VIBRATE_ON_REMINDER, lastVibrateOnReminder).apply() set(lastVibrateOnReminder) = prefs.edit().putBoolean(LAST_VIBRATE_ON_REMINDER, lastVibrateOnReminder).apply()
var defaultStartTime: Int var defaultStartTime: Int
get() = prefs.getInt(DEFAULT_START_TIME, -1) get() = prefs.getInt(DEFAULT_START_TIME, DEFAULT_START_TIME_NEXT_FULL_HOUR)
set(defaultStartTime) = prefs.edit().putInt(DEFAULT_START_TIME, defaultStartTime).apply() set(defaultStartTime) = prefs.edit().putInt(DEFAULT_START_TIME, defaultStartTime).apply()
var defaultDuration: Int var defaultDuration: Int

2
app/src/main/kotlin/com/simplemobiletools/calendar/pro/helpers/Constants.kt
View File

@@ -34,6 +34,8 @@ const val ITEM_EVENT = 0
const val ITEM_EVENT_SIMPLE = 1 const val ITEM_EVENT_SIMPLE = 1
const val ITEM_HEADER = 2 const val ITEM_HEADER = 2
const val DEFAULT_START_TIME_NEXT_FULL_HOUR = -1
const val DAY = 86400 const val DAY = 86400
const val WEEK = 604800 const val WEEK = 604800
const val MONTH = 2592001 // exact value not taken into account, Joda is used for adding months and years const val MONTH = 2592001 // exact value not taken into account, Joda is used for adding months and years