From fde20a4500a1da2444c08140a3ac9c4550b69255 Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Tue, 11 Jun 2013 08:57:25 +0400 Subject: better approach to hiding headlines menu when it is unneded (refs #712) --- src/org/fox/ttrss/HeadlinesActivity.java | 6 +++--- src/org/fox/ttrss/offline/OfflineHeadlinesActivity.java | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) (limited to 'src') diff --git a/src/org/fox/ttrss/HeadlinesActivity.java b/src/org/fox/ttrss/HeadlinesActivity.java index 0bd5cabc..2d3ff4f7 100644 --- a/src/org/fox/ttrss/HeadlinesActivity.java +++ b/src/org/fox/ttrss/HeadlinesActivity.java @@ -35,7 +35,7 @@ public class HeadlinesActivity extends OnlineActivity implements HeadlinesEventL getSupportActionBar().setDisplayHomeAsUpEnabled(true); - setSmallScreen(findViewById(R.id.headlines_fragment) == null); + setSmallScreen(findViewById(R.id.sw600dp_anchor) == null); GlobalState.getInstance().load(savedInstanceState); @@ -140,9 +140,9 @@ public class HeadlinesActivity extends OnlineActivity implements HeadlinesEventL if (m_menu != null && getSessionId() != null) { m_menu.setGroupVisible(R.id.menu_group_feeds, false); - HeadlinesFragment hf = (HeadlinesFragment)getSupportFragmentManager().findFragmentByTag(FRAG_HEADLINES); + //HeadlinesFragment hf = (HeadlinesFragment)getSupportFragmentManager().findFragmentByTag(FRAG_HEADLINES); - m_menu.setGroupVisible(R.id.menu_group_headlines, !isPortrait() && hf != null && hf.isAdded() && hf.isVisible()); + m_menu.setGroupVisible(R.id.menu_group_headlines, !isPortrait() && !isSmallScreen()); ArticlePager af = (ArticlePager) getSupportFragmentManager().findFragmentByTag(FRAG_ARTICLE); diff --git a/src/org/fox/ttrss/offline/OfflineHeadlinesActivity.java b/src/org/fox/ttrss/offline/OfflineHeadlinesActivity.java index 08620fbe..5495d5b6 100644 --- a/src/org/fox/ttrss/offline/OfflineHeadlinesActivity.java +++ b/src/org/fox/ttrss/offline/OfflineHeadlinesActivity.java @@ -38,7 +38,7 @@ public class OfflineHeadlinesActivity extends OfflineActivity implements Offline getSupportActionBar().setDisplayHomeAsUpEnabled(true); - setSmallScreen(findViewById(R.id.headlines_fragment) == null); + setSmallScreen(findViewById(R.id.sw600dp_anchor) == null); if (isPortrait()) { findViewById(R.id.headlines_fragment).setVisibility(View.GONE); @@ -135,13 +135,13 @@ public class OfflineHeadlinesActivity extends OfflineActivity implements Offline @Override protected void initMenu() { super.initMenu(); - + if (m_menu != null) { m_menu.setGroupVisible(R.id.menu_group_feeds, false); - OfflineHeadlinesFragment hf = (OfflineHeadlinesFragment)getSupportFragmentManager().findFragmentByTag(FRAG_HEADLINES); + //OfflineHeadlinesFragment hf = (OfflineHeadlinesFragment)getSupportFragmentManager().findFragmentByTag(FRAG_HEADLINES); - m_menu.setGroupVisible(R.id.menu_group_headlines, !isPortrait() && hf != null && hf.isAdded() && hf.isVisible()); + m_menu.setGroupVisible(R.id.menu_group_headlines, !isPortrait() && !isSmallScreen()); Fragment af = getSupportFragmentManager().findFragmentByTag(FRAG_ARTICLE); -- cgit v1.2.3