diff --git a/app/src/main/java/ru/vtosters/lite/ui/fragments/FeedFragment.java b/app/src/main/java/ru/vtosters/lite/ui/fragments/FeedFragment.java index b0c255830..e9e660677 100644 --- a/app/src/main/java/ru/vtosters/lite/ui/fragments/FeedFragment.java +++ b/app/src/main/java/ru/vtosters/lite/ui/fragments/FeedFragment.java @@ -4,7 +4,6 @@ import android.content.Context; import android.os.Bundle; import android.text.TextUtils; import com.vk.core.dialogs.alert.VkAlertDialog; -import com.vk.newsfeed.NewsfeedSettingsFragment; import com.vk.newsfeed.controllers.NewsfeedController; import com.vtosters.lite.R; import com.vtosters.lite.ui.SummaryListPreference; @@ -26,11 +25,6 @@ public class FeedFragment extends TrackedMaterialPreferenceToolbarFragment { } private void prefs() { - findPreference("officialnewssett").setOnPreferenceClickListener(preference -> { - NavigatorUtils.switchFragment(requireContext(), NewsfeedSettingsFragment.class); - return true; - }); - findPreference("sponsorpost").setOnPreferenceClickListener(preference -> { NavigatorUtils.switchFragment(requireContext(), SponsorPostFragment.class); return true; diff --git a/app/src/main/java/ru/vtosters/lite/ui/fragments/SponsorPostFragment.java b/app/src/main/java/ru/vtosters/lite/ui/fragments/SponsorPostFragment.java index 66de0a378..e47a1ae49 100644 --- a/app/src/main/java/ru/vtosters/lite/ui/fragments/SponsorPostFragment.java +++ b/app/src/main/java/ru/vtosters/lite/ui/fragments/SponsorPostFragment.java @@ -65,9 +65,10 @@ public class SponsorPostFragment extends TrackedMaterialPreferenceToolbarFragmen PreferenceFragmentUtils.addPreferenceCategory(getPreferenceScreen(), "Sponsor Post Фильтры"); List lists; + List downloaded = FiltersPreferences.getAllDownloadedFilters(); if (!NetworkUtils.isNetworkConnected() || NetworkUtils.isInternetSlow()) { - lists = FiltersPreferences.getAllDownloadedFilters(); + lists = downloaded; } else { lists = FilterService.getFilters(null); } @@ -111,6 +112,17 @@ public class SponsorPostFragment extends TrackedMaterialPreferenceToolbarFragmen ); } + if (!downloaded.isEmpty()) { + PreferenceFragmentUtils.addPreference( + getPreferenceScreen(), + "", + "Количество правил", + "Используется " + FiltersPreferences.getFiltersLists().size() + " правил для фильтрации ленты", + null, + null + ); + } + PreferenceFragmentUtils.addPreference( getPreferenceScreen(), "", diff --git a/app/src/main/java/ru/vtosters/lite/utils/newsfeed/NewsFeedFiltersUtils.java b/app/src/main/java/ru/vtosters/lite/utils/newsfeed/NewsFeedFiltersUtils.java index 79036b266..d3109db8f 100644 --- a/app/src/main/java/ru/vtosters/lite/utils/newsfeed/NewsFeedFiltersUtils.java +++ b/app/src/main/java/ru/vtosters/lite/utils/newsfeed/NewsFeedFiltersUtils.java @@ -383,7 +383,7 @@ public class NewsFeedFiltersUtils { Collections.emptySet() ); - return whitelist.contains(id); + return getBoolValue("invertFilters", false) != whitelist.contains(id); } public static Boolean hasMiniAppAds(JSONObject list) { diff --git a/smali/res/xml/preferences_feed.xml b/smali/res/xml/preferences_feed.xml index d3bf4aacf..117485d5c 100644 --- a/smali/res/xml/preferences_feed.xml +++ b/smali/res/xml/preferences_feed.xml @@ -100,10 +100,6 @@ android:title="@string/feed_ads_sources"/> - + android:enabled="false" + android:summary="@string/why_news_not_updated_summ" + android:title="@string/why_news_not_updated_title"/>