diff options
Diffstat (limited to 'org.fox.ttrss')
3 files changed, 5 insertions, 69 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; diff --git a/org.fox.ttrss/src/main/res/layout/fragment_feeds.xml b/org.fox.ttrss/src/main/res/layout/fragment_feeds.xml index 5adec284..408e3840 100755 --- a/org.fox.ttrss/src/main/res/layout/fragment_feeds.xml +++ b/org.fox.ttrss/src/main/res/layout/fragment_feeds.xml @@ -10,54 +10,13 @@ <com.google.android.material.appbar.AppBarLayout android:background="@null" android:layout_width="match_parent" - android:layout_height="wrap_content"> + android:layout_height="8dp"> <FrameLayout app:layout_scrollFlags="scroll|enterAlways" android:layout_width="match_parent" android:layout_height="wrap_content"> - <com.google.android.material.button.MaterialButton - style="?attr/materialIconButtonStyle" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:scaleX="1.5" - android:scaleY="1.5" - app:icon="@drawable/baseline_settings_24" - android:id="@+id/drawer_settings_btn" - android:layout_gravity="center_vertical|end" /> - - <LinearLayout - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:orientation="vertical" - android:layout_alignParentBottom="true" - android:layout_alignParentLeft="true" - android:layout_alignParentStart="true" - android:id="@+id/linearLayout" - android:layout_gravity="center_horizontal|bottom"> - - <TextView - android:id="@+id/drawer_header_login" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_marginStart="16dp" - tools:text="user" - android:textAppearance="?attr/textAppearanceHeadlineSmall" - android:textColor="?attr/colorOnSurface"/> - - <TextView - android:id="@+id/drawer_header_server" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_marginStart="16dp" - android:layout_marginTop="8dp" - android:layout_marginBottom="8dp" - tools:text="example.org" - android:textAppearance="?attr/textAppearanceTitleSmall" - android:textColor="?attr/colorOnSurfaceVariant"/> - </LinearLayout> - <com.google.android.material.progressindicator.LinearProgressIndicator android:id="@+id/loading_progress" android:max="100" |