summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAndrew Dolgov <[email protected]>2011-11-24 09:06:47 +0300
committerAndrew Dolgov <[email protected]>2011-11-24 09:06:47 +0300
commitd7dfd661ce86a6db4eac472a365ce0437c24ea0a (patch)
treef853f68738abf943d46acab35386c3c6009ba439 /src
parentd5f17058c4c2446b925c289bdd2f572263bac6cd (diff)
menu updates
Diffstat (limited to 'src')
-rw-r--r--src/org/fox/ttrss/HeadlinesFragment.java5
-rw-r--r--src/org/fox/ttrss/MainActivity.java7
2 files changed, 9 insertions, 3 deletions
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());