diff --git a/app/src/main/java/net/vonforst/evmap/auto/FilterScreen.kt b/app/src/main/java/net/vonforst/evmap/auto/FilterScreen.kt index 632ab317..a187be08 100644 --- a/app/src/main/java/net/vonforst/evmap/auto/FilterScreen.kt +++ b/app/src/main/java/net/vonforst/evmap/auto/FilterScreen.kt @@ -204,6 +204,37 @@ class FilterScreen(ctx: CarContext, val session: EVMapSession) : Screen(ctx) { Row.IMAGE_TYPE_ICON ) setOnClickListener { onItemClick(it.id) } + if (carContext.carAppApiLevel >= 6) { + // Delete action + addAction(Action.Builder().apply { + setIcon( + CarIcon.Builder( + IconCompat.createWithResource( + carContext, + R.drawable.ic_delete + ) + ).build() + + ) + setOnClickListener { + lifecycleScope.launch { + db.filterProfileDao().delete(it) + if (prefs.filterStatus == it.id) { + prefs.filterStatus = FILTERS_DISABLED + } + CarToast.makeText( + carContext, + carContext.getString( + R.string.deleted_filterprofile, + it.name + ), + CarToast.LENGTH_SHORT + ).show() + invalidate() + } + } + }.build()) + } }.build()) } if (page < paginatedProfiles.size - 1) { @@ -293,7 +324,8 @@ class EditFiltersScreen(ctx: CarContext) : Screen(ctx) { setActionStrip(ActionStrip.Builder().apply { val currentProfile = vm.filterProfile.value - if (currentProfile != null) { + if (currentProfile != null && carContext.carAppApiLevel < 6) { + // Delete action (when row actions are not available) addAction(Action.Builder().apply { setIcon( CarIcon.Builder(