From 081b98e9c0abbccaf2d99028e68e2a4a139f17cf Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <noreply@fakecake.org>
Date: Sat, 1 Nov 2014 09:23:20 +0300
Subject: remove drawer in headlines_articles on phones

---
 org.fox.ttrss/src/main/AndroidManifest.xml         |  4 +--
 .../main/java/org/fox/ttrss/HeadlinesFragment.java |  8 +-----
 .../ttrss/offline/OfflineHeadlinesFragment.java    |  8 +-----
 .../src/main/res/layout/headlines_articles.xml     | 30 +++++++++-------------
 4 files changed, 16 insertions(+), 34 deletions(-)

(limited to 'org.fox.ttrss')

diff --git a/org.fox.ttrss/src/main/AndroidManifest.xml b/org.fox.ttrss/src/main/AndroidManifest.xml
index c8f3f77e..66259bd9 100644
--- a/org.fox.ttrss/src/main/AndroidManifest.xml
+++ b/org.fox.ttrss/src/main/AndroidManifest.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="org.fox.ttrss"
-    android:versionCode="254"
-    android:versionName="1.51" >
+    android:versionCode="255"
+    android:versionName="1.52" >
 
     <uses-sdk
         android:minSdkVersion="9"
diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/HeadlinesFragment.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/HeadlinesFragment.java
index 3b0d9d5e..2b7cd8c6 100644
--- a/org.fox.ttrss/src/main/java/org/fox/ttrss/HeadlinesFragment.java
+++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/HeadlinesFragment.java
@@ -768,7 +768,7 @@ public class HeadlinesFragment extends Fragment implements OnItemClickListener,
 			String articleContent = article.content != null ? article.content : "";
 
 			if (holder.excerptView != null) {
-				if ((m_compactLayoutMode && m_activity.isSmallScreen()) || !m_prefs.getBoolean("headlines_show_content", true)) {
+				if (!m_prefs.getBoolean("headlines_show_content", true)) {
 					holder.excerptView.setVisibility(View.GONE);
 				} else {
 					String excerpt = Jsoup.parse(articleContent).text(); 
@@ -966,12 +966,6 @@ public class HeadlinesFragment extends Fragment implements OnItemClickListener,
 				});								
 			}
 
-            if (m_compactLayoutMode && m_activity.isSmallScreen()) {
-                if (holder.headlineFooter != null) {
-                    holder.headlineFooter.setVisibility(View.GONE);
-                }
-            }
-			
 			return v;
 		}
 
diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineHeadlinesFragment.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineHeadlinesFragment.java
index 56e90248..50815f8d 100644
--- a/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineHeadlinesFragment.java
+++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineHeadlinesFragment.java
@@ -592,7 +592,7 @@ public class OfflineHeadlinesFragment extends Fragment implements OnItemClickLis
 			TextView te = (TextView)v.findViewById(R.id.excerpt);
 
 			if (te != null) {
-				if ((m_compactLayoutMode && m_activity.isSmallScreen()) || !m_prefs.getBoolean("headlines_show_content", true)) {
+				if (!m_prefs.getBoolean("headlines_show_content", true)) {
 					te.setVisibility(View.GONE);
 				} else {
 					String excerpt = Jsoup.parse(article.getString(article.getColumnIndex("content"))).text(); 
@@ -684,12 +684,6 @@ public class OfflineHeadlinesFragment extends Fragment implements OnItemClickLis
 				});								
 			}
 
-            View headlineFooter = v.findViewById(R.id.headline_footer);
-
-            if (headlineFooter != null && m_compactLayoutMode && m_activity.isSmallScreen()) {
-                headlineFooter.setVisibility(View.GONE);
-            }
-
             return v;
 		}
 
diff --git a/org.fox.ttrss/src/main/res/layout/headlines_articles.xml b/org.fox.ttrss/src/main/res/layout/headlines_articles.xml
index 09dfb852..06fb8b57 100644
--- a/org.fox.ttrss/src/main/res/layout/headlines_articles.xml
+++ b/org.fox.ttrss/src/main/res/layout/headlines_articles.xml
@@ -4,25 +4,19 @@
     android:layout_width="fill_parent"
     android:layout_height="fill_parent">
 
-    <android.support.v4.widget.DrawerLayout
-        android:id="@+id/headlines_drawer"
+    <FrameLayout
+        android:id="@+id/article_fragment"
         android:layout_width="match_parent"
-        android:layout_height="match_parent">
+        android:layout_height="match_parent"
+        android:background="?articleBackground">
+    </FrameLayout>
 
-        <FrameLayout
-            android:id="@+id/article_fragment"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:background="?articleBackground">
-        </FrameLayout>
-
-        <FrameLayout
-            android:id="@+id/headlines_fragment"
-            android:layout_height="match_parent"
-            android:layout_width="240dp"
-            android:layout_gravity="start"
-            android:background="?headlinesBackgroundSolid">
-        </FrameLayout>
-    </android.support.v4.widget.DrawerLayout>
+    <FrameLayout
+        android:id="@+id/headlines_fragment"
+        android:visibility="gone"
+        android:layout_height="0dp"
+        android:layout_width="0dp"
+        android:background="?headlinesBackgroundSolid">
+    </FrameLayout>
 
 </FrameLayout>
\ No newline at end of file
-- 
cgit v1.2.3