better approach to hiding headlines menu when it is unneded (refs #712)

5 files changed, 29 insertions, 8 deletions

diff --git a/res/layout-sw600dp-land/headlines_articles.xml b/res/layout-sw600dp-land/headlines_articles.xml
index b6cb1c38..817a0bb4 100644
--- a/res/layout-sw600dp-land/headlines_articles.xml
+++ b/res/layout-sw600dp-land/headlines_articles.xml
@@ -4,6 +4,13 @@
     android:layout_height="fill_parent"

     android:orientation="vertical" >

 

+    <FrameLayout

+        android:id="@+id/sw600dp_anchor"

+        android:layout_width="match_parent"

+        android:layout_height="wrap_content"

+        android:visibility="gone" >

+    </FrameLayout>

+

     <LinearLayout

         android:id="@+id/loading_container"

         android:layout_width="match_parent"

diff --git a/res/layout-sw600dp-port/headlines_articles.xml b/res/layout-sw600dp-port/headlines_articles.xml
index 8608c386..fa7f6ce6 100644
--- a/res/layout-sw600dp-port/headlines_articles.xml
+++ b/res/layout-sw600dp-port/headlines_articles.xml
@@ -2,7 +2,14 @@
     android:id="@+id/main"

     android:layout_width="fill_parent"

     android:layout_height="fill_parent"

-    android:orientation="vertical">
+    android:orientation="vertical">

+

+    <FrameLayout

+        android:id="@+id/sw600dp_anchor"

+        android:layout_width="match_parent"

+        android:layout_height="wrap_content"

+        android:visibility="gone" >

+    </FrameLayout>

 

     <LinearLayout

         android:id="@+id/loading_container"

diff --git a/res/layout-sw700dp/headlines_articles.xml b/res/layout-sw700dp/headlines_articles.xml
index b6cb1c38..817a0bb4 100644
--- a/res/layout-sw700dp/headlines_articles.xml
+++ b/res/layout-sw700dp/headlines_articles.xml
@@ -4,6 +4,13 @@
     android:layout_height="fill_parent"

     android:orientation="vertical" >

 

+    <FrameLayout

+        android:id="@+id/sw600dp_anchor"

+        android:layout_width="match_parent"

+        android:layout_height="wrap_content"

+        android:visibility="gone" >

+    </FrameLayout>

+

     <LinearLayout

         android:id="@+id/loading_container"

         android:layout_width="match_parent"

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