From 532afaad2b7aea4815adbf3c4bbcce1b039af58d Mon Sep 17 00:00:00 2001 From: Konrad Pozniak Date: Fri, 28 Oct 2022 16:46:38 +0200 Subject: [PATCH] warn before deleting a scheduled post (#2721) --- .../components/scheduled/ScheduledStatusActivity.kt | 9 ++++++++- .../tusky/components/scheduled/ScheduledStatusAdapter.kt | 3 +-- app/src/main/res/values/strings.xml | 1 + 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/com/keylesspalace/tusky/components/scheduled/ScheduledStatusActivity.kt b/app/src/main/java/com/keylesspalace/tusky/components/scheduled/ScheduledStatusActivity.kt index 2ed261c7..43ce346d 100644 --- a/app/src/main/java/com/keylesspalace/tusky/components/scheduled/ScheduledStatusActivity.kt +++ b/app/src/main/java/com/keylesspalace/tusky/components/scheduled/ScheduledStatusActivity.kt @@ -19,6 +19,7 @@ import android.content.Context import android.content.Intent import android.os.Bundle import androidx.activity.viewModels +import androidx.appcompat.app.AlertDialog import androidx.lifecycle.lifecycleScope import androidx.paging.LoadState import androidx.recyclerview.widget.DividerItemDecoration @@ -134,7 +135,13 @@ class ScheduledStatusActivity : BaseActivity(), ScheduledStatusActionListener, I } override fun delete(item: ScheduledStatus) { - viewModel.deleteScheduledStatus(item) + AlertDialog.Builder(this) + .setMessage(R.string.delete_scheduled_post_warning) + .setNegativeButton(android.R.string.cancel, null) + .setPositiveButton(android.R.string.ok) { _, _ -> + viewModel.deleteScheduledStatus(item) + } + .show() } companion object { diff --git a/app/src/main/java/com/keylesspalace/tusky/components/scheduled/ScheduledStatusAdapter.kt b/app/src/main/java/com/keylesspalace/tusky/components/scheduled/ScheduledStatusAdapter.kt index ec8110de..7b34b780 100644 --- a/app/src/main/java/com/keylesspalace/tusky/components/scheduled/ScheduledStatusAdapter.kt +++ b/app/src/main/java/com/keylesspalace/tusky/components/scheduled/ScheduledStatusAdapter.kt @@ -57,8 +57,7 @@ class ScheduledStatusAdapter( v.isEnabled = false listener.edit(item) } - holder.binding.delete.setOnClickListener { v: View -> - v.isEnabled = false + holder.binding.delete.setOnClickListener { listener.delete(item) } } diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index b999d5ae..094f4e68 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -668,5 +668,6 @@ You have re-logged into your current account to grant push subscription permission to Tusky. However, you still have other accounts that have not been migrated this way. Switch to them and re-login one by one in order to enable UnifiedPush notifications support. %s (🔗 %s) + Delete this scheduled post?