diff options
| author | Andrew Dolgov <[email protected]> | 2011-11-28 21:49:18 +0300 |
|---|---|---|
| committer | Andrew Dolgov <[email protected]> | 2011-11-28 21:49:18 +0300 |
| commit | 47e65d7b918c2293525bd6569a0bee7229bf3af6 (patch) | |
| tree | b73f821e7e7f25d87096cb228b864d64ff3f7562 | |
| parent | 2b15ba91d4469fbb92b13195785f474bec0b3d3c (diff) | |
category fixes in tablet mode
| -rw-r--r-- | res/menu/main_menu.xml | 2 | ||||
| -rw-r--r-- | src/org/fox/ttrss/MainActivity.java | 6 |
2 files changed, 6 insertions, 2 deletions
diff --git a/res/menu/main_menu.xml b/res/menu/main_menu.xml index 3c699bf3..c3279196 100644 --- a/res/menu/main_menu.xml +++ b/res/menu/main_menu.xml @@ -18,7 +18,7 @@ android:showAsAction=""/> <item android:id="@+id/back_to_categories" - android:icon="@android:drawable/ic_menu_revert" + android:icon="@android:drawable/ic_menu_close_clear_cancel" android:title="@string/back_to_categories" android:showAsAction="ifRoom|withText"/> diff --git a/src/org/fox/ttrss/MainActivity.java b/src/org/fox/ttrss/MainActivity.java index 6fa372ba..678310f8 100644 --- a/src/org/fox/ttrss/MainActivity.java +++ b/src/org/fox/ttrss/MainActivity.java @@ -412,6 +412,7 @@ public class MainActivity extends FragmentActivity implements FeedsFragment.OnFe } private void closeCategory() { + findViewById(R.id.feeds_fragment).setVisibility(View.GONE); findViewById(R.id.cats_fragment).setVisibility(View.VISIBLE); @@ -548,6 +549,7 @@ public class MainActivity extends FragmentActivity implements FeedsFragment.OnFe m_menu.findItem(R.id.update_feeds).setVisible(false); m_menu.findItem(R.id.show_feeds).setVisible(false); + m_menu.findItem(R.id.back_to_categories).setVisible(false); } else { m_menu.findItem(R.id.close_article).setVisible(false); m_menu.findItem(R.id.share_article).setVisible(false); @@ -562,6 +564,8 @@ public class MainActivity extends FragmentActivity implements FeedsFragment.OnFe m_menu.findItem(R.id.show_feeds).setVisible(false); m_menu.findItem(R.id.update_feeds).setVisible(false); } + + m_menu.findItem(R.id.back_to_categories).setVisible(m_activeCategory != null); } if (!m_smallScreenMode) { @@ -572,7 +576,7 @@ public class MainActivity extends FragmentActivity implements FeedsFragment.OnFe m_menu.findItem(R.id.show_all_articles).setVisible(m_activeFeed != null && m_selectedArticle == null); } - m_menu.findItem(R.id.back_to_categories).setVisible(m_activeCategory != null); + } else { m_menu.findItem(R.id.login).setVisible(true); |