feat: upcoming event page time filter pill #252
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,142 @@ | ||
| // | ||
| // Calendar Notifications Plus | ||
| // Copyright (C) 2025 William Harris (wharris+cnplus@upscalews.com) | ||
| // | ||
| // This program is free software; you can redistribute it and/or modify | ||
| // it under the terms of the GNU General Public License as published by | ||
| // the Free Software Foundation; either version 3 of the License, or | ||
| // (at your option) any later version. | ||
| // | ||
| // This program is distributed in the hope that it will be useful, | ||
| // but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| // GNU General Public License for more details. | ||
| // | ||
| // You should have received a copy of the GNU General Public License | ||
| // along with this program; if not, write to the Free Software Foundation, | ||
| // Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA | ||
| // | ||
|
|
||
| package com.github.quarck.calnotify.prefs | ||
|
|
||
| import android.app.AlertDialog | ||
| import android.content.Context | ||
| import android.os.Bundle | ||
| import android.util.AttributeSet | ||
| import android.view.View | ||
| import android.widget.EditText | ||
| import android.widget.TextView | ||
| import androidx.preference.DialogPreference | ||
| import androidx.preference.PreferenceDialogFragmentCompat | ||
| import com.github.quarck.calnotify.R | ||
| import com.github.quarck.calnotify.Settings | ||
|
|
||
| class UpcomingTimePresetPreferenceX @JvmOverloads constructor( | ||
| context: Context, | ||
| attrs: AttributeSet? = null, | ||
| defStyleAttr: Int = androidx.preference.R.attr.dialogPreferenceStyle, | ||
| defStyleRes: Int = 0 | ||
| ) : DialogPreference(context, attrs, defStyleAttr, defStyleRes) { | ||
|
|
||
| var presetValue: String = Settings.DEFAULT_UPCOMING_TIME_PRESETS | ||
| private set | ||
|
|
||
| init { | ||
| dialogLayoutResource = R.layout.dialog_upcoming_time_presets | ||
| positiveButtonText = context.getString(android.R.string.ok) | ||
| negativeButtonText = context.getString(android.R.string.cancel) | ||
| } | ||
|
|
||
| fun persistPreset(value: String) { | ||
| presetValue = value | ||
| persistString(value) | ||
| notifyChanged() | ||
| } | ||
|
|
||
| override fun onSetInitialValue(defaultValue: Any?) { | ||
| presetValue = getPersistedString((defaultValue as? String) ?: Settings.DEFAULT_UPCOMING_TIME_PRESETS) | ||
| } | ||
|
|
||
| override fun onGetDefaultValue(a: android.content.res.TypedArray, index: Int): Any? { | ||
| return a.getString(index) | ||
| } | ||
|
|
||
| class Dialog : PreferenceDialogFragmentCompat() { | ||
| private var edit: EditText? = null | ||
|
|
||
| override fun onBindDialogView(view: View) { | ||
| super.onBindDialogView(view) | ||
|
|
||
| val pref = preference as UpcomingTimePresetPreferenceX | ||
|
|
||
| val label = view.findViewById<TextView>(R.id.text_label_upcoming_presets) | ||
| label?.text = getString(R.string.dialog_upcoming_time_presets_label, Settings.MAX_LOOKAHEAD_DAYS.toInt(), Settings.MAX_UPCOMING_TIME_PRESETS) | ||
|
|
||
| edit = view.findViewById(R.id.edit_text_upcoming_time_presets) | ||
| edit?.setText(pref.presetValue) | ||
| } | ||
|
|
||
| override fun onDialogClosed(positiveResult: Boolean) { | ||
| if (positiveResult) { | ||
| val value = edit?.text?.toString() | ||
|
|
||
| if (value != null) { | ||
| val presets = PreferenceUtils.parseSnoozePresets(value) | ||
| if (presets != null) { | ||
| // Filter out negative values | ||
| val validPresets = presets.filter { it > 0 } | ||
|
There was a problem hiding this comment. Dialog validates positivity but not max lookahead constraintMedium Severity The dialog's Additional Locations (1) |
||
| val newValue = if (validPresets.isEmpty()) { | ||
| Settings.DEFAULT_UPCOMING_TIME_PRESETS | ||
| } else { | ||
| value.split(',') | ||
| .map { it.trim() } | ||
| .filter { it.isNotEmpty() } | ||
| .joinToString(", ") | ||
| } | ||
|
|
||
| val pref = preference as UpcomingTimePresetPreferenceX | ||
| if (pref.callChangeListener(newValue)) { | ||
| pref.persistPreset(newValue) | ||
| } | ||
|
|
||
| if (validPresets.size > Settings.MAX_UPCOMING_TIME_PRESETS) { | ||
| showFormattedMessage(R.string.error_too_many_upcoming_presets, Settings.MAX_UPCOMING_TIME_PRESETS) | ||
| } | ||
| } else { | ||
| showMessage(R.string.error_cannot_parse_preset) | ||
| } | ||
| } | ||
| } | ||
| } | ||
|
|
||
| private fun showMessage(id: Int) { | ||
| val context = requireContext() | ||
| AlertDialog.Builder(context) | ||
| .setMessage(context.getString(id)) | ||
| .setCancelable(false) | ||
| .setPositiveButton(android.R.string.ok) { _, _ -> } | ||
| .create() | ||
| .show() | ||
| } | ||
|
|
||
| private fun showFormattedMessage(id: Int, vararg args: Any) { | ||
| val context = requireContext() | ||
| AlertDialog.Builder(context) | ||
| .setMessage(context.getString(id, *args)) | ||
| .setCancelable(false) | ||
| .setPositiveButton(android.R.string.ok) { _, _ -> } | ||
| .create() | ||
| .show() | ||
| } | ||
|
|
||
| companion object { | ||
| fun newInstance(key: String): Dialog { | ||
| val fragment = Dialog() | ||
| val args = Bundle(1) | ||
| args.putString(ARG_KEY, key) | ||
| fragment.arguments = args | ||
| return fragment | ||
| } | ||
| } | ||
| } | ||
| } | ||
|
There was a problem hiding this comment. Preset preference class duplicates existing SnoozePresetPreferenceXLow Severity
|
||
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.