From 6d9f4a23c8f85639db62cc20008f03438bc4c496 Mon Sep 17 00:00:00 2001
From: gdlbo <41114720+gdlbo@users.noreply.github.com>
Date: Wed, 8 Feb 2023 18:00:36 +0300
Subject: [PATCH] added newsfeed update dialog

---
 .../lite/ui/fragments/FeedFragment.java       | 44 ++++++++++---------
 smali/res/xml/preferences_feed.xml            | 16 +++++--
 2 files changed, 36 insertions(+), 24 deletions(-)

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 d78c849cf..6e810993f 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
@@ -1,27 +1,23 @@
 package ru.vtosters.lite.ui.fragments;
 
-import static ru.vtosters.lite.utils.AndroidUtils.edit;
-import static ru.vtosters.lite.utils.AndroidUtils.getDefaultPrefs;
-import static ru.vtosters.lite.utils.AndroidUtils.getPrefsValue;
-import static ru.vtosters.lite.utils.AndroidUtils.sendToast;
-import static ru.vtosters.lite.utils.NewsFeedFiltersUtils.setupFilters;
-import static ru.vtosters.lite.utils.Preferences.copyright_post;
-
 import android.content.Context;
-import android.content.Intent;
 import android.os.Bundle;
 import android.text.TextUtils;
-
 import androidx.preference.Preference;
-
 import com.vk.core.dialogs.alert.VkAlertDialog;
-import com.vk.navigation.Navigator;
 import com.vk.newsfeed.NewsfeedSettingsFragment;
+import com.vk.newsfeed.controllers.NewsfeedController;
 import com.vtosters.lite.R;
 import com.vtosters.lite.general.fragments.MaterialPreferenceToolbarFragment;
-
+import com.vtosters.lite.ui.SummaryListPreference;
 import ru.vtosters.lite.ui.components.NewsfeedListManager;
 import ru.vtosters.lite.utils.NavigatorUtils;
+import ru.vtosters.lite.utils.NewsFeedFiltersUtils;
+import ru.vtosters.lite.utils.Preferences;
+
+import java.util.Objects;
+
+import static ru.vtosters.lite.utils.AndroidUtils.*;
 
 public class FeedFragment extends MaterialPreferenceToolbarFragment {
     @Override
@@ -33,28 +29,36 @@ public class FeedFragment extends MaterialPreferenceToolbarFragment {
 
     private void prefs() {
         findPreference("officialnewssett").setOnPreferenceClickListener(preference -> {
-            NavigatorUtils.switchFragment(requireContext(), SystemInfo.class);
+            NavigatorUtils.switchFragment(requireContext(), NewsfeedSettingsFragment.class);
+            return true;
+        });
+        findPreference("cringecopyright").setEnabled(!Preferences.copyright_post());
 
+        var findPreference = (SummaryListPreference) findPreference("newsfeed_order");
+        findPreference.setValue(NewsfeedController.e.k() ? "top" : "recent");
+        findPreference.setOnPreferenceChangeListener((preference, o) -> {
+            NewsfeedController.e.a(0);
+            NewsfeedController.e.a((Boolean) Objects.equals(o, "top"));
+            NewsfeedController.e.b(true);
             return true;
         });
-        findPreference("cringecopyright").setEnabled(!copyright_post());
 
         findPreference("spamfilters").setSummary(count(getPrefsValue("spamfilters")));
         findPreference("sourcenamefilter").setSummary(count(getPrefsValue("sourcenamefilter")));
         findPreference("linkfilter").setSummary(count(getPrefsValue("linkfilter")));
 
         findPreference("spamfilters").setOnPreferenceClickListener(preference -> {
-            setupFilters();
+            NewsFeedFiltersUtils.setupFilters();
             return true;
         });
 
         findPreference("sourcenamefilter").setOnPreferenceClickListener(preference -> {
-            setupFilters();
+            NewsFeedFiltersUtils.setupFilters();
             return true;
         });
 
         findPreference("linkfilter").setOnPreferenceClickListener(preference -> {
-            setupFilters();
+            NewsFeedFiltersUtils.setupFilters();
             return true;
         });
 
@@ -108,7 +112,7 @@ public class FeedFragment extends MaterialPreferenceToolbarFragment {
                 .setPositiveButton(requireContext().getString(R.string.yes), (dialogInterface, i) -> {
                     edit().remove(key).apply();
                     sendToast(requireContext().getString(R.string.elements_deleted_success));
-                    setupFilters();
+                    NewsFeedFiltersUtils.setupFilters();
                 })
                 .setNegativeButton(requireContext().getString(R.string.cancel),
                         (dialogInterface, i) -> dialogInterface.dismiss())
@@ -136,8 +140,8 @@ public class FeedFragment extends MaterialPreferenceToolbarFragment {
 
     @Override
     public boolean onPreferenceTreeClick(Preference preference) {
-        findPreference("cringecopyright").setEnabled(!copyright_post());
-        setupFilters();
+        findPreference("cringecopyright").setEnabled(!Preferences.copyright_post());
+        NewsFeedFiltersUtils.setupFilters();
         return super.onPreferenceTreeClick(preference);
     }
 
diff --git a/smali/res/xml/preferences_feed.xml b/smali/res/xml/preferences_feed.xml
index 0523ec6dd..bc7f5f541 100644
--- a/smali/res/xml/preferences_feed.xml
+++ b/smali/res/xml/preferences_feed.xml
@@ -105,10 +105,18 @@
                 android:key="officialnewssett"
                 android:summary="@string/officialnewssett_summary"
                 android:title="@string/officialnewssett"/>
-        <Preference
-                android:enabled="false"
-                android:summary="@string/why_news_not_updated_summ"
-                android:title="@string/why_news_not_updated_title"/>
+        <com.vtosters.lite.ui.SummaryListPreference
+                android:defaultValue="order"
+                android:dialogTitle="@string/newsfeed_settings_order"
+                android:entries="@array/newsfeed_settings_feed_type"
+                android:entryValues="@array/newsfeed_settings_feed_type_v"
+                android:key="newsfeed_order"
+                android:textColor="?text_secondary"
+                android:title="@string/newsfeed_settings_order"/>
+<!--        <Preference-->
+<!--                android:enabled="false"-->
+<!--                android:summary="@string/why_news_not_updated_summ"-->
+<!--                android:title="@string/why_news_not_updated_title"/>-->
         <com.vtosters.lite.ui.SummaryListPreference
                 android:defaultValue="default"
                 android:dialogTitle="@string/feed_other_update_dialog_title"