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

make advance filter list enabled for fdroid

This commit is contained in:
Tlaster 2021-03-01 16:32:09 +08:00
parent c1430497ac
commit b1557f17be
4 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
twidere/src/main/kotlin/org/mariotaku/twidere/extension/util/ExtraFeaturesServiceExtensions.kt
View File

@ -26,4 +26,4 @@ import org.mariotaku.twidere.util.premium.ExtraFeaturesService.Companion.FEATURE
* Created by mariotaku on 2017/9/14. * Created by mariotaku on 2017/9/14.
*/ */
val ExtraFeaturesService.isAdvancedFiltersEnabled: Boolean val ExtraFeaturesService.isAdvancedFiltersEnabled: Boolean
get() = isEnabled(FEATURE_ADVANCED_FILTERS) || isEnabled("filters_subscriptions") get() = true//isEnabled(FEATURE_ADVANCED_FILTERS) || isEnabled("filters_subscriptions")

4
twidere/src/main/kotlin/org/mariotaku/twidere/fragment/filter/FilteredUsersFragment.kt
View File

@ -115,7 +115,7 @@ class FilteredUsersFragment : BaseFiltersFragment() {
override fun onPrepareOptionsMenu(menu: Menu) { override fun onPrepareOptionsMenu(menu: Menu) {
super.onPrepareOptionsMenu(menu) super.onPrepareOptionsMenu(menu)
val isFeaturesSupported = extraFeaturesService.isSupported() val isFeaturesSupported = extraFeaturesService.isSupported()
menu.setGroupAvailability(R.id.import_export, isFeaturesSupported) menu.setGroupAvailability(R.id.import_export, true)
} }
override fun onOptionsItemSelected(item: MenuItem): Boolean { override fun onOptionsItemSelected(item: MenuItem): Boolean {
@ -147,7 +147,7 @@ class FilteredUsersFragment : BaseFiltersFragment() {
override fun onPrepareActionMode(mode: ActionMode, menu: Menu): Boolean { override fun onPrepareActionMode(mode: ActionMode, menu: Menu): Boolean {
val result = super.onPrepareActionMode(mode, menu) val result = super.onPrepareActionMode(mode, menu)
val isFeaturesSupported = extraFeaturesService.isSupported() val isFeaturesSupported = extraFeaturesService.isSupported()
menu.setGroupAvailability(R.id.import_export, isFeaturesSupported) menu.setGroupAvailability(R.id.import_export, true)
return result && menu.hasVisibleItems() return result && menu.hasVisibleItems()
} }

4
twidere/src/main/kotlin/org/mariotaku/twidere/fragment/filter/FiltersSubscriptionsFragment.kt
View File

@ -71,8 +71,8 @@ class FiltersSubscriptionsFragment : BaseFragment(), LoaderManager.LoaderCallbac
if (!extraFeaturesService.isSupported()) { if (!extraFeaturesService.isSupported()) {
activity?.finish() // activity?.finish()
return // return
} }
if (savedInstanceState == null) { if (savedInstanceState == null) {

9
twidere/src/main/res/xml/preferences_filters.xml
View File

@ -10,14 +10,15 @@
android:defaultValue="false" android:defaultValue="false"
android:key="filter_possibility_sensitive_statuses" android:key="filter_possibility_sensitive_statuses"
android:title="@string/preference_filter_possibility_sensitive_statuses"/> android:title="@string/preference_filter_possibility_sensitive_statuses"/>
<org.mariotaku.twidere.preference.PremiumEntryPreferenceCategory android:title="@string/preference_title_filter_subscriptions"> <org.mariotaku.twidere.preference.TintedPreferenceCategory
<org.mariotaku.twidere.preference.PremiumEntryPreference android:title="@string/preference_title_filter_subscriptions">
<Preference
android:key="manage_filter_subscriptions" android:key="manage_filter_subscriptions"
android:title="@string/preference_title_filter_manage_subscriptions"> android:title="@string/preference_title_filter_manage_subscriptions">
<intent <intent
android:data="twidere://filters/subscriptions" android:data="twidere://filters/subscriptions"
android:targetClass="org.mariotaku.twidere.activity.LinkHandlerActivity" android:targetClass="org.mariotaku.twidere.activity.LinkHandlerActivity"
android:targetPackage="org.mariotaku.twidere"/> android:targetPackage="org.mariotaku.twidere"/>
</org.mariotaku.twidere.preference.PremiumEntryPreference> </Preference>
</org.mariotaku.twidere.preference.PremiumEntryPreferenceCategory> </org.mariotaku.twidere.preference.TintedPreferenceCategory>
</PreferenceScreen> </PreferenceScreen>