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

Added more options

Browse Source
This commit is contained in:
Agnieszka C
2021-12-24 12:45:03 +01:00
parent 81528f2438
commit bde9a497dc
1 changed files with 21 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
app/src/main/kotlin/com/simplemobiletools/calendar/pro/activities/WidgetListConfigureActivity.kt
View File

@@ -89,7 +89,7 @@ class WidgetListConfigureActivity : SimpleActivity() {
} }
private fun saveConfig() { private fun saveConfig() {
val widget = Widget(null, mWidgetId, calculatePeriod()) val widget = Widget(null, mWidgetId, selectedPeriodOption)
ensureBackgroundThread { ensureBackgroundThread {
widgetsDB.insertOrUpdate(widget) widgetsDB.insertOrUpdate(widget)
} }
@@ -104,24 +104,28 @@ class WidgetListConfigureActivity : SimpleActivity() {
finish() finish()
} }
private fun calculatePeriod(): Int { private fun calculatePeriod(selectedPeriodValue: Int, selectedPeriodValueType: Int): Int {
return if (selectedPeriodOption == EVENT_PERIOD_CUSTOM && selectedPeriodValue != null) { return when (selectedPeriodValueType) {
when (selectedPeriodValueType) { R.id.dialog_radio_days -> selectedPeriodValue * DAY
R.id.dialog_radio_days -> selectedPeriodValue!! * DAY R.id.dialog_radio_weeks -> selectedPeriodValue * WEEK
R.id.dialog_radio_weeks -> selectedPeriodValue!! * WEEK else -> selectedPeriodValue * MONTH
else -> selectedPeriodValue!! * MONTH
} }
} else {
selectedPeriodOption
} }
private fun getCustomRadioItems(): List<RadioItem> {
val items = ArrayList<RadioItem>()
items.add(RadioItem(calculatePeriod(1, R.id.dialog_radio_weeks), resources.getQuantityString(R.plurals.within_the_next_weeks, 1, 1)))
items.add(RadioItem(calculatePeriod(1, R.id.dialog_radio_months), resources.getQuantityString(R.plurals.within_the_next_months, 1, 1)))
return items
} }
private fun showPeriodSelector() { private fun showPeriodSelector() {
hideKeyboard() hideKeyboard()
val items = ArrayList<RadioItem>() val items = ArrayList<RadioItem>()
items.add(RadioItem(EVENT_PERIOD_ONE_YEAR, getString(R.string.within_the_next_one_year)))
items.add(RadioItem(EVENT_PERIOD_TODAY, getString(R.string.today_only))) items.add(RadioItem(EVENT_PERIOD_TODAY, getString(R.string.today_only)))
items.addAll(getCustomRadioItems())
items.add(RadioItem(EVENT_PERIOD_ONE_YEAR, getString(R.string.within_the_next_one_year)))
items.add(RadioItem(EVENT_PERIOD_CUSTOM, getString(R.string.within_the_next))) items.add(RadioItem(EVENT_PERIOD_CUSTOM, getString(R.string.within_the_next)))
RadioGroupDialog(this, items, selectedPeriodOption, showOKButton = true, cancelCallback = null) { RadioGroupDialog(this, items, selectedPeriodOption, showOKButton = true, cancelCallback = null) {
@@ -141,10 +145,11 @@ class WidgetListConfigureActivity : SimpleActivity() {
when (selectedPeriodOption) { when (selectedPeriodOption) {
EVENT_PERIOD_ONE_YEAR -> period_picker_value.setText(R.string.within_the_next_one_year) EVENT_PERIOD_ONE_YEAR -> period_picker_value.setText(R.string.within_the_next_one_year)
EVENT_PERIOD_TODAY -> period_picker_value.setText(R.string.today_only) EVENT_PERIOD_TODAY -> period_picker_value.setText(R.string.today_only)
else -> { EVENT_PERIOD_CUSTOM -> {
if (periodValue != null && periodValue != 0 && periodType != null) { if (periodValue != null && periodValue != 0 && periodType != null) {
selectedPeriodValue = periodValue selectedPeriodValue = periodValue
selectedPeriodValueType = periodType selectedPeriodValueType = periodType
selectedPeriodOption = calculatePeriod(selectedPeriodValue!!, selectedPeriodValueType!!)
when (periodType) { when (periodType) {
R.id.dialog_radio_days -> period_picker_value.setText(resources.getQuantityString(R.plurals.within_the_next_days, periodValue, periodValue)) R.id.dialog_radio_days -> period_picker_value.setText(resources.getQuantityString(R.plurals.within_the_next_days, periodValue, periodValue))
R.id.dialog_radio_weeks -> period_picker_value.setText(resources.getQuantityString(R.plurals.within_the_next_weeks, periodValue, periodValue)) R.id.dialog_radio_weeks -> period_picker_value.setText(resources.getQuantityString(R.plurals.within_the_next_weeks, periodValue, periodValue))
@@ -155,6 +160,10 @@ class WidgetListConfigureActivity : SimpleActivity() {
period_picker_value.setText(R.string.within_the_next_one_year) period_picker_value.setText(R.string.within_the_next_one_year)
} }
} }
else -> {
val item = getCustomRadioItems().find { it.id == selectedPeriodOption }
period_picker_value.setText(item?.title)
}
} }
} }