iamthefij/tt-rss-android
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

category fixes in tablet mode

Browse Source
This commit is contained in:
Andrew Dolgov 2011-11-28 21:49:18 +03:00
parent 2b15ba91d4
commit 47e65d7b91
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
res/menu/main_menu.xml
View File

@ -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"/>

6
src/org/fox/ttrss/MainActivity.java
View File

@ -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);