From 623eb1fe2a6e430211560db261e217c7623a9653 Mon Sep 17 00:00:00 2001
From: kyori19 <kyori@accelf.net>
Date: Sat, 9 May 2020 02:17:02 +0900
Subject: [PATCH] Add "account" filter context (#1776)

---
 app/src/main/java/com/keylesspalace/tusky/entity/Filter.kt | 1 +
 .../com/keylesspalace/tusky/fragment/TimelineFragment.java | 7 ++++++-
 .../fragment/preference/AccountPreferencesFragment.kt      | 6 ++++++
 app/src/main/res/xml/account_preferences.xml               | 4 ++++
 4 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/com/keylesspalace/tusky/entity/Filter.kt b/app/src/main/java/com/keylesspalace/tusky/entity/Filter.kt
index 6d6cbaa5..58bdc79a 100644
--- a/app/src/main/java/com/keylesspalace/tusky/entity/Filter.kt
+++ b/app/src/main/java/com/keylesspalace/tusky/entity/Filter.kt
@@ -30,6 +30,7 @@ data class Filter (
         const val NOTIFICATIONS = "notifications"
         const val PUBLIC = "public"
         const val THREAD = "thread"
+        const val ACCOUNT = "account"
     }
 
     override fun hashCode(): Int {
diff --git a/app/src/main/java/com/keylesspalace/tusky/fragment/TimelineFragment.java b/app/src/main/java/com/keylesspalace/tusky/fragment/TimelineFragment.java
index 8b729630..10e1d133 100644
--- a/app/src/main/java/com/keylesspalace/tusky/fragment/TimelineFragment.java
+++ b/app/src/main/java/com/keylesspalace/tusky/fragment/TimelineFragment.java
@@ -379,6 +379,10 @@ public class TimelineFragment extends SFragment implements
                 return filterContext.contains(Filter.PUBLIC);
             case FAVOURITES:
                 return (filterContext.contains(Filter.PUBLIC) || filterContext.contains(Filter.NOTIFICATIONS));
+            case USER:
+            case USER_WITH_REPLIES:
+            case USER_PINNED:
+                return filterContext.contains(Filter.ACCOUNT);
             default:
                 return false;
         }
@@ -872,7 +876,8 @@ public class TimelineFragment extends SFragment implements
             case Filter.HOME:
             case Filter.NOTIFICATIONS:
             case Filter.THREAD:
-            case Filter.PUBLIC: {
+            case Filter.PUBLIC:
+            case Filter.ACCOUNT: {
                 if (filterContextMatchesKind(kind, Collections.singletonList(key))) {
                     reloadFilters(true);
                 }
diff --git a/app/src/main/java/com/keylesspalace/tusky/fragment/preference/AccountPreferencesFragment.kt b/app/src/main/java/com/keylesspalace/tusky/fragment/preference/AccountPreferencesFragment.kt
index 1698270f..3e54f7ce 100644
--- a/app/src/main/java/com/keylesspalace/tusky/fragment/preference/AccountPreferencesFragment.kt
+++ b/app/src/main/java/com/keylesspalace/tusky/fragment/preference/AccountPreferencesFragment.kt
@@ -73,6 +73,7 @@ class AccountPreferencesFragment : PreferenceFragmentCompat(),
     private lateinit var notificationFiltersPreference: Preference
     private lateinit var publicFiltersPreference: Preference
     private lateinit var threadFiltersPreference: Preference
+    private lateinit var accountFiltersPreference: Preference
 
     override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {
         addPreferencesFromResource(R.xml.account_preferences)
@@ -91,6 +92,7 @@ class AccountPreferencesFragment : PreferenceFragmentCompat(),
         notificationFiltersPreference = requirePreference("notificationFilters")
         publicFiltersPreference = requirePreference("publicFilters")
         threadFiltersPreference = requirePreference("threadFilters")
+        accountFiltersPreference = requirePreference("accountFilters")
 
         notificationPreference.icon = IconicsDrawable(notificationPreference.context, GoogleMaterial.Icon.gmd_notifications).apply { sizeRes = R.dimen.preference_icon_size; colorInt = ThemeUtils.getColor(notificationPreference.context, R.attr.iconColor) }
         mutedUsersPreference.icon = getTintedIcon(R.drawable.ic_mute_24dp)
@@ -106,6 +108,7 @@ class AccountPreferencesFragment : PreferenceFragmentCompat(),
         notificationFiltersPreference.onPreferenceClickListener = this
         publicFiltersPreference.onPreferenceClickListener = this
         threadFiltersPreference.onPreferenceClickListener = this
+        accountFiltersPreference.onPreferenceClickListener = this
 
         defaultPostPrivacyPreference.onPreferenceChangeListener = this
         defaultMediaSensitivityPreference.onPreferenceChangeListener = this
@@ -224,6 +227,9 @@ class AccountPreferencesFragment : PreferenceFragmentCompat(),
             threadFiltersPreference -> {
                 launchFilterActivity(Filter.THREAD, R.string.pref_title_thread_filter_keywords)
             }
+            accountFiltersPreference -> {
+                launchFilterActivity(Filter.ACCOUNT, R.string.title_accounts)
+            }
 
             else -> false
         }
diff --git a/app/src/main/res/xml/account_preferences.xml b/app/src/main/res/xml/account_preferences.xml
index 5b316c72..ec4d2c2a 100644
--- a/app/src/main/res/xml/account_preferences.xml
+++ b/app/src/main/res/xml/account_preferences.xml
@@ -73,5 +73,9 @@
         <Preference
             android:key="threadFilters"
             android:title="@string/pref_title_thread_filter_keywords" />
+
+        <Preference
+            android:key="accountFilters"
+            android:title="@string/title_accounts" />
     </PreferenceCategory>
 </androidx.preference.PreferenceScreen>