Limit custom alerts to notification events
This commit is contained in:
@@ -31,8 +31,6 @@ class AppRulesFragment : Fragment(R.layout.fragment_app_rules) {
|
||||
binding!!.addRule.setOnClickListener { edit(null) }
|
||||
binding!!.allowMultipleMatches.isChecked = store.load().appSettings.firstOrNull { it.packageName == packageName }?.allowMultipleMatches == true
|
||||
binding!!.allowMultipleMatches.setOnCheckedChangeListener { _, enabled -> setAllowMultipleMatches(enabled) }
|
||||
binding!!.directAlertControl.isChecked = store.load().appSettings.firstOrNull { it.packageName == packageName }?.directAlertControl == true
|
||||
binding!!.directAlertControl.setOnCheckedChangeListener { _, enabled -> setDirectAlertControl(enabled) }
|
||||
ItemTouchHelper(object : ItemTouchHelper.SimpleCallback(ItemTouchHelper.UP or ItemTouchHelper.DOWN, 0) {
|
||||
override fun onMove(recyclerView: RecyclerView, holder: RecyclerView.ViewHolder, target: RecyclerView.ViewHolder): Boolean {
|
||||
adapter.move(holder.bindingAdapterPosition, target.bindingAdapterPosition)
|
||||
@@ -75,15 +73,9 @@ class AppRulesFragment : Fragment(R.layout.fragment_app_rules) {
|
||||
saveAppSettings(configuration, setting)
|
||||
}
|
||||
|
||||
private fun setDirectAlertControl(enabled: Boolean) {
|
||||
val configuration = store.load()
|
||||
val old = configuration.appSettings.firstOrNull { it.packageName == packageName }
|
||||
saveAppSettings(configuration, (old ?: AlertAppSettings(packageName)).copy(directAlertControl = enabled))
|
||||
}
|
||||
|
||||
private fun saveAppSettings(configuration: se.ajpanton.notificationsmaster.alerts.AlertConfiguration, setting: AlertAppSettings) {
|
||||
store.save(configuration.copy(appSettings = configuration.appSettings.filterNot { it.packageName == packageName } +
|
||||
if (setting.allowMultipleMatches || setting.directAlertControl) listOf(setting) else emptyList()))
|
||||
if (setting.allowMultipleMatches) listOf(setting) else emptyList()))
|
||||
}
|
||||
|
||||
private class RuleAdapter(private val onClick: (AlertRule) -> Unit) : RecyclerView.Adapter<RuleAdapter.Holder>() {
|
||||
|
||||
Reference in New Issue
Block a user