From 79a69513ae7c3433b8b9f207bb6219f0cc889f67 Mon Sep 17 00:00:00 2001 From: Nik Clayton Date: Fri, 22 Nov 2024 14:52:17 +0100 Subject: [PATCH] refactor: Rename clearWarningAction to clearContentFilter (#1125) --- .../app/pachli/components/conversation/ConversationsFragment.kt | 2 +- .../pachli/components/notifications/NotificationsFragment.kt | 2 +- .../components/search/fragments/SearchStatusesFragment.kt | 2 +- .../java/app/pachli/components/timeline/TimelineFragment.kt | 2 +- .../java/app/pachli/components/viewthread/ViewThreadFragment.kt | 2 +- app/src/main/java/app/pachli/interfaces/StatusActionListener.kt | 2 +- .../java/app/pachli/util/ListStatusAccessibilityDelegate.kt | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/app/src/main/java/app/pachli/components/conversation/ConversationsFragment.kt b/app/src/main/java/app/pachli/components/conversation/ConversationsFragment.kt index 3ff889fa8..81ae8f477 100644 --- a/app/src/main/java/app/pachli/components/conversation/ConversationsFragment.kt +++ b/app/src/main/java/app/pachli/components/conversation/ConversationsFragment.kt @@ -356,7 +356,7 @@ class ConversationsFragment : viewModel.voteInPoll(choices, viewData.lastStatus.actionableId, poll.id) } - override fun clearWarningAction(pachliAccountId: Long, viewData: ConversationViewData) { + override fun clearContentFilter(pachliAccountId: Long, viewData: ConversationViewData) { } // Filters don't apply in conversations diff --git a/app/src/main/java/app/pachli/components/notifications/NotificationsFragment.kt b/app/src/main/java/app/pachli/components/notifications/NotificationsFragment.kt index ba1709b19..6161eaedf 100644 --- a/app/src/main/java/app/pachli/components/notifications/NotificationsFragment.kt +++ b/app/src/main/java/app/pachli/components/notifications/NotificationsFragment.kt @@ -632,7 +632,7 @@ class NotificationsFragment : onContentCollapsedChange(pachliAccountId, viewData, isCollapsed) } - override fun clearWarningAction(pachliAccountId: Long, viewData: NotificationViewData) { + override fun clearContentFilter(pachliAccountId: Long, viewData: NotificationViewData) { adapter.snapshot().withIndex().filter { it.value?.statusViewData?.actionableId == viewData.statusViewData!!.actionableId } .map { it.value?.statusViewData = it.value?.statusViewData?.copy( diff --git a/app/src/main/java/app/pachli/components/search/fragments/SearchStatusesFragment.kt b/app/src/main/java/app/pachli/components/search/fragments/SearchStatusesFragment.kt index 4301191dc..49389d5c5 100644 --- a/app/src/main/java/app/pachli/components/search/fragments/SearchStatusesFragment.kt +++ b/app/src/main/java/app/pachli/components/search/fragments/SearchStatusesFragment.kt @@ -160,7 +160,7 @@ class SearchStatusesFragment : SearchFragment(), StatusActionLis viewModel.voteInPoll(viewData, poll, choices) } - override fun clearWarningAction(pachliAccountId: Long, viewData: StatusViewData) {} + override fun clearContentFilter(pachliAccountId: Long, viewData: StatusViewData) {} override fun onReblog(viewData: StatusViewData, reblog: Boolean) { viewModel.reblog(viewData, reblog) diff --git a/app/src/main/java/app/pachli/components/timeline/TimelineFragment.kt b/app/src/main/java/app/pachli/components/timeline/TimelineFragment.kt index e8f197b03..4ee45a2a1 100644 --- a/app/src/main/java/app/pachli/components/timeline/TimelineFragment.kt +++ b/app/src/main/java/app/pachli/components/timeline/TimelineFragment.kt @@ -650,7 +650,7 @@ class TimelineFragment : viewModel.accept(StatusAction.VoteInPoll(poll, choices, viewData)) } - override fun clearWarningAction(pachliAccountId: Long, viewData: StatusViewData) { + override fun clearContentFilter(pachliAccountId: Long, viewData: StatusViewData) { viewModel.clearWarning(pachliAccountId, viewData) } diff --git a/app/src/main/java/app/pachli/components/viewthread/ViewThreadFragment.kt b/app/src/main/java/app/pachli/components/viewthread/ViewThreadFragment.kt index 5cae8f3b8..36dbe4151 100644 --- a/app/src/main/java/app/pachli/components/viewthread/ViewThreadFragment.kt +++ b/app/src/main/java/app/pachli/components/viewthread/ViewThreadFragment.kt @@ -397,7 +397,7 @@ class ViewThreadFragment : } } - override fun clearWarningAction(pachliAccountId: Long, viewData: StatusViewData) { + override fun clearContentFilter(pachliAccountId: Long, viewData: StatusViewData) { viewModel.clearWarning(viewData) } diff --git a/app/src/main/java/app/pachli/interfaces/StatusActionListener.kt b/app/src/main/java/app/pachli/interfaces/StatusActionListener.kt index a19326c4c..9fb0faade 100644 --- a/app/src/main/java/app/pachli/interfaces/StatusActionListener.kt +++ b/app/src/main/java/app/pachli/interfaces/StatusActionListener.kt @@ -58,7 +58,7 @@ interface StatusActionListener : LinkListener { fun onShowFavs(statusId: String) {} fun onVoteInPoll(viewData: T, poll: Poll, choices: List) fun onShowEdits(statusId: String) {} - fun clearWarningAction(pachliAccountId: Long, viewData: T) + fun clearContentFilter(pachliAccountId: Long, viewData: T) /** Edit the filter that matched this status. */ fun onEditFilterById(pachliAccountId: Long, filterId: String) diff --git a/app/src/main/java/app/pachli/util/ListStatusAccessibilityDelegate.kt b/app/src/main/java/app/pachli/util/ListStatusAccessibilityDelegate.kt index eb0bc952b..70cd0cad6 100644 --- a/app/src/main/java/app/pachli/util/ListStatusAccessibilityDelegate.kt +++ b/app/src/main/java/app/pachli/util/ListStatusAccessibilityDelegate.kt @@ -201,7 +201,7 @@ class ListStatusAccessibilityDelegate( app.pachli.core.ui.R.id.action_more -> { statusActionListener.onMore(host, status) } - app.pachli.core.ui.R.id.action_show_anyway -> statusActionListener.clearWarningAction(pachliAccountId, status) + app.pachli.core.ui.R.id.action_show_anyway -> statusActionListener.clearContentFilter(pachliAccountId, status) app.pachli.core.ui.R.id.action_edit_filter -> { (recyclerView.findContainingViewHolder(host) as? FilterableStatusViewHolder<*>)?.matchedFilter?.let { statusActionListener.onEditFilterById(pachliAccountId, it.id)