about summary refs log tree commit diff stats
path: root/org.fox.ttrss/src/main/java
diff options
context:
space:
mode:
authorAndrew Dolgov <fox@fakecake.org>2025-05-25 13:03:21 +0300
committerAndrew Dolgov <fox@fakecake.org>2025-05-25 13:03:21 +0300
commit46376aeb3aec02e8b7f3f314f1d1d66796972111 (patch)
treed4a0a276575cde996186c893553101efd5ac74e8 /org.fox.ttrss/src/main/java
parent0fd1479c4d25c0b60b956ed528ed456d3a1bc4ef (diff)
downloadtt-rss-android-46376aeb3aec02e8b7f3f314f1d1d66796972111.tar.gz
tt-rss-android-46376aeb3aec02e8b7f3f314f1d1d66796972111.tar.xz
empty drawer header, move settings to root categories list as a footer
Diffstat (limited to 'org.fox.ttrss/src/main/java')
-rwxr-xr-xorg.fox.ttrss/src/main/java/org/fox/ttrss/FeedsFragment.java30
-rw-r--r--org.fox.ttrss/src/main/java/org/fox/ttrss/types/Feed.java1
2 files changed, 4 insertions, 27 deletions
diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/FeedsFragment.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/FeedsFragment.java
index 974f5955..ec90f180 100755
--- a/org.fox.ttrss/src/main/java/org/fox/ttrss/FeedsFragment.java
+++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/FeedsFragment.java
@@ -184,33 +184,6 @@ public class FeedsFragment extends Fragment implements OnSharedPreferenceChangeL
         m_adapter = new FeedsAdapter();
         m_list.setAdapter(m_adapter);
 
-        TextView login = view.findViewById(R.id.drawer_header_login);
-
-        if (login != null) {
-            login.setText(m_prefs.getString("login", ""));
-        }
-
-        TextView server = view.findViewById(R.id.drawer_header_server);
-
-        if (server != null) {
-            try {
-                server.setText(new URL(m_prefs.getString("ttrss_url", "")).getHost());
-            } catch (MalformedURLException e) {
-                server.setText("");
-            }
-        }
-
-        View settingsBtn = view.findViewById(R.id.drawer_settings_btn);
-
-        if (settingsBtn != null) {
-            settingsBtn.setOnClickListener(v -> {
-                Intent intent = new Intent(getActivity(),
-                        PreferencesActivity.class);
-
-                startActivityForResult(intent, 0);
-            });
-        }
-
         FeedsModel model = getModel();
 
         model.getUpdatesData().observe(m_activity, lastUpdate -> {
@@ -291,6 +264,7 @@ public class FeedsFragment extends Fragment implements OnSharedPreferenceChangeL
 
         feedsWork.add(new Feed(Feed.TYPE_DIVIDER));
         feedsWork.add(new Feed(Feed.TYPE_TOGGLE_UNREAD, getString(R.string.unread_only), true));
+        feedsWork.add(new Feed(Feed.TYPE_SETTINGS, getString(R.string.preferences), true));
 
         m_adapter.submitList(feedsWork);
     }
@@ -508,6 +482,8 @@ public class FeedsFragment extends Fragment implements OnSharedPreferenceChangeL
     protected int getIconForFeed(Feed feed) {
         if (feed.id == Feed.TYPE_GOBACK) {
             return R.drawable.baseline_arrow_back_24;
+        } else if (feed.id == Feed.TYPE_SETTINGS) {
+            return R.drawable.baseline_settings_24;
         } else if (feed.id == Feed.CAT_LABELS && feed.is_cat) {
             return R.drawable.baseline_label_24;
         } else if (feed.id == Feed.CAT_SPECIAL && feed.is_cat) {
diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/types/Feed.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/types/Feed.java
index 9fc40e96..f9c53705 100644
--- a/org.fox.ttrss/src/main/java/org/fox/ttrss/types/Feed.java
+++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/types/Feed.java
@@ -11,6 +11,7 @@ public class Feed implements Comparable<Feed>, Parcelable {
     public static final int TYPE_GOBACK = -10001;
     public static final int TYPE_DIVIDER = -10002;
     public static final int TYPE_TOGGLE_UNREAD = -10003;
+    public static final int TYPE_SETTINGS = -10004;
 
     public String feed_url;
     public String title;