From d7dfd661ce86a6db4eac472a365ce0437c24ea0a Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Thu, 24 Nov 2011 09:06:47 +0300 Subject: [PATCH] menu updates --- res/menu/main_menu.xml | 7 ++++++- res/values/strings.xml | 5 +++-- src/org/fox/ttrss/HeadlinesFragment.java | 5 ++++- src/org/fox/ttrss/MainActivity.java | 7 +++++-- 4 files changed, 18 insertions(+), 6 deletions(-) diff --git a/res/menu/main_menu.xml b/res/menu/main_menu.xml index ac7423c4..f7bec3fb 100644 --- a/res/menu/main_menu.xml +++ b/res/menu/main_menu.xml @@ -2,7 +2,12 @@ + + No unread feeds. No unread headlines. Loading, please wait... - Unread feeds - All feeds + Show unread feeds + Show all feeds + Update diff --git a/src/org/fox/ttrss/HeadlinesFragment.java b/src/org/fox/ttrss/HeadlinesFragment.java index 6a3e4d27..8aceb830 100644 --- a/src/org/fox/ttrss/HeadlinesFragment.java +++ b/src/org/fox/ttrss/HeadlinesFragment.java @@ -61,7 +61,10 @@ public class HeadlinesFragment extends Fragment implements OnItemClickListener { list.setAdapter(m_adapter); list.setOnItemClickListener(this); - if (m_feed != null) refresh(); + if (m_feed != null) + refresh(); + else + view.findViewById(R.id.loading_container).setVisibility(View.GONE); return view; } diff --git a/src/org/fox/ttrss/MainActivity.java b/src/org/fox/ttrss/MainActivity.java index 09d94620..e839c55b 100644 --- a/src/org/fox/ttrss/MainActivity.java +++ b/src/org/fox/ttrss/MainActivity.java @@ -199,11 +199,14 @@ public class MainActivity extends Activity implements FeedsFragment.OnFeedSelect Intent intent = new Intent(this, PreferencesActivity.class); startActivityForResult(intent, 0); return true; + case R.id.update: + refreshFeeds(); + return true; case R.id.show_feeds: if (getUnreadOnly()) { - item.setTitle(R.string.menu_all_feeds); - } else { item.setTitle(R.string.menu_unread_feeds); + } else { + item.setTitle(R.string.menu_all_feeds); } setUnreadOnly(!getUnreadOnly());