diff options
| -rw-r--r-- | res/menu/main_menu.xml | 7 | ||||
| -rw-r--r-- | res/values/strings.xml | 5 | ||||
| -rw-r--r-- | src/org/fox/ttrss/HeadlinesFragment.java | 5 | ||||
| -rw-r--r-- | 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 @@ <menu xmlns:android="http://schemas.android.com/apk/res/android"> <item android:id="@+id/show_feeds" android:icon="@android:drawable/ic_menu_rotate" - android:title="@string/menu_unread_feeds" + android:title="@string/menu_all_feeds" + android:showAsAction=""/> + + <item android:id="@+id/update" + android:icon="@android:drawable/ic_menu_rotate" + android:title="@string/update" android:showAsAction="ifRoom|withText"/> <item android:id="@+id/preferences" diff --git a/res/values/strings.xml b/res/values/strings.xml index 44d99b3d..5947deb9 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -26,7 +26,8 @@ <string name="no_unread_feeds">No unread feeds.</string> <string name="no_unread_headlines">No unread headlines.</string> <string name="loading_message">Loading, please wait...</string> - <string name="menu_unread_feeds">Unread feeds</string> - <string name="menu_all_feeds">All feeds</string> + <string name="menu_unread_feeds">Show unread feeds</string> + <string name="menu_all_feeds">Show all feeds</string> + <string name="update">Update</string> </resources> 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()); |