Mastodon
/
Tusky-App-Android
mirror of https://github.com/tuskyapp/Tusky
1
0
Fork 0
Code Issues Releases Wiki Activity

Add "account" filter context (#1776)

This commit is contained in:
kyori19 2020-05-09 02:17:02 +09:00 committed by GitHub
parent 23a1701151
commit 623eb1fe2a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/src/main/java/com/keylesspalace/tusky/entity/Filter.kt
View File

@ -30,6 +30,7 @@ data class Filter (
const val NOTIFICATIONS = "notifications" const val NOTIFICATIONS = "notifications"
const val PUBLIC = "public" const val PUBLIC = "public"
const val THREAD = "thread" const val THREAD = "thread"
const val ACCOUNT = "account"
} }
override fun hashCode(): Int { override fun hashCode(): Int {

7
app/src/main/java/com/keylesspalace/tusky/fragment/TimelineFragment.java
View File

@ -379,6 +379,10 @@ public class TimelineFragment extends SFragment implements
return filterContext.contains(Filter.PUBLIC); return filterContext.contains(Filter.PUBLIC);
case FAVOURITES: case FAVOURITES:
return (filterContext.contains(Filter.PUBLIC) || filterContext.contains(Filter.NOTIFICATIONS)); return (filterContext.contains(Filter.PUBLIC) || filterContext.contains(Filter.NOTIFICATIONS));
case USER:
case USER_WITH_REPLIES:
case USER_PINNED:
return filterContext.contains(Filter.ACCOUNT);
default: default:
return false; return false;
} }
@ -872,7 +876,8 @@ public class TimelineFragment extends SFragment implements
case Filter.HOME: case Filter.HOME:
case Filter.NOTIFICATIONS: case Filter.NOTIFICATIONS:
case Filter.THREAD: case Filter.THREAD:
case Filter.PUBLIC: { case Filter.PUBLIC:
case Filter.ACCOUNT: {
if (filterContextMatchesKind(kind, Collections.singletonList(key))) { if (filterContextMatchesKind(kind, Collections.singletonList(key))) {
reloadFilters(true); reloadFilters(true);
} }

6
app/src/main/java/com/keylesspalace/tusky/fragment/preference/AccountPreferencesFragment.kt
View File

@ -73,6 +73,7 @@ class AccountPreferencesFragment : PreferenceFragmentCompat(),
private lateinit var notificationFiltersPreference: Preference private lateinit var notificationFiltersPreference: Preference
private lateinit var publicFiltersPreference: Preference private lateinit var publicFiltersPreference: Preference
private lateinit var threadFiltersPreference: Preference private lateinit var threadFiltersPreference: Preference
private lateinit var accountFiltersPreference: Preference
override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) { override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {
addPreferencesFromResource(R.xml.account_preferences) addPreferencesFromResource(R.xml.account_preferences)
@ -91,6 +92,7 @@ class AccountPreferencesFragment : PreferenceFragmentCompat(),
notificationFiltersPreference = requirePreference("notificationFilters") notificationFiltersPreference = requirePreference("notificationFilters")
publicFiltersPreference = requirePreference("publicFilters") publicFiltersPreference = requirePreference("publicFilters")
threadFiltersPreference = requirePreference("threadFilters") 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) } 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) mutedUsersPreference.icon = getTintedIcon(R.drawable.ic_mute_24dp)
@ -106,6 +108,7 @@ class AccountPreferencesFragment : PreferenceFragmentCompat(),
notificationFiltersPreference.onPreferenceClickListener = this notificationFiltersPreference.onPreferenceClickListener = this
publicFiltersPreference.onPreferenceClickListener = this publicFiltersPreference.onPreferenceClickListener = this
threadFiltersPreference.onPreferenceClickListener = this threadFiltersPreference.onPreferenceClickListener = this
accountFiltersPreference.onPreferenceClickListener = this
defaultPostPrivacyPreference.onPreferenceChangeListener = this defaultPostPrivacyPreference.onPreferenceChangeListener = this
defaultMediaSensitivityPreference.onPreferenceChangeListener = this defaultMediaSensitivityPreference.onPreferenceChangeListener = this
@ -224,6 +227,9 @@ class AccountPreferencesFragment : PreferenceFragmentCompat(),
threadFiltersPreference -> { threadFiltersPreference -> {
launchFilterActivity(Filter.THREAD, R.string.pref_title_thread_filter_keywords) launchFilterActivity(Filter.THREAD, R.string.pref_title_thread_filter_keywords)
} }
accountFiltersPreference -> {
launchFilterActivity(Filter.ACCOUNT, R.string.title_accounts)
}
else -> false else -> false
} }

4
app/src/main/res/xml/account_preferences.xml
View File

@ -73,5 +73,9 @@
<Preference <Preference
android:key="threadFilters" android:key="threadFilters"
android:title="@string/pref_title_thread_filter_keywords" /> android:title="@string/pref_title_thread_filter_keywords" />
<Preference
android:key="accountFilters"
android:title="@string/title_accounts" />
</PreferenceCategory> </PreferenceCategory>
</androidx.preference.PreferenceScreen> </androidx.preference.PreferenceScreen>