experimental use of titlebarwebview

2 files changed, 25 insertions, 13 deletions

diff --git a/res/layout/article_fragment.xml b/res/layout/article_fragment.xml
index 2320625b..4849b5a8 100644
--- a/res/layout/article_fragment.xml
+++ b/res/layout/article_fragment.xml
@@ -1,8 +1,8 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"

     android:id="@+id/article_fragment"

     android:layout_width="fill_parent"

-    android:padding="5sp"

     android:layout_height="fill_parent"

+    android:padding="5sp" 

     android:orientation="vertical" >
 

         <LinearLayout

@@ -10,8 +10,7 @@
             android:layout_width="match_parent"

             android:layout_height="wrap_content"

             android:layout_weight="0"

-            android:orientation="vertical"

-            android:paddingBottom="5sp" >

+            android:orientation="vertical" >

 

             <TextView

                 android:id="@+id/title"

@@ -56,21 +55,23 @@
                     android:textAppearance="?android:attr/textAppearanceSmall"

                     android:textSize="13sp" />

             </LinearLayout>

-        </LinearLayout>

 

-        <ImageView

-            android:layout_width="match_parent"

-            android:layout_height="wrap_content"

-            android:layout_weight="0"

-            android:background="?horizontalDivider"

-            android:paddingTop="2dip" />

+            <ImageView

+                android:layout_width="match_parent"

+                android:layout_height="wrap_content"

+                android:layout_weight="0"

+                android:background="?horizontalDivider"

+                android:layout_marginBottom="5sp"                

+                android:paddingTop="2dip" />

+

+        </LinearLayout>

 

-        <WebView

+        <com.nobu_games.android.view.web.TitleBarWebView

             android:id="@+id/content"

             android:layout_width="match_parent"

             android:layout_height="match_parent"

             android:layout_weight="1"

-            android:padding="5sp" />

+            />

 

         <LinearLayout

             android:id="@+id/attachments_holder"

diff --git a/src/org/fox/ttrss/ArticleFragment.java b/src/org/fox/ttrss/ArticleFragment.java
index 282fb7f4..9e3734e8 100644
--- a/src/org/fox/ttrss/ArticleFragment.java
+++ b/src/org/fox/ttrss/ArticleFragment.java
@@ -13,6 +13,8 @@ import org.jsoup.nodes.Document;
 import org.jsoup.nodes.Element;

 import org.jsoup.select.Elements;

 

+import com.nobu_games.android.view.web.TitleBarWebView;

+

 import android.annotation.SuppressLint;

 import android.app.ActionBar;

 import android.app.Activity;

@@ -40,6 +42,7 @@ import android.webkit.WebSettings.LayoutAlgorithm;
 import android.webkit.WebView;

 import android.widget.ArrayAdapter;

 import android.widget.Button;

+import android.widget.LinearLayout;

 import android.widget.Spinner;

 import android.widget.TextView;

 

@@ -171,9 +174,17 @@ public class ArticleFragment extends Fragment implements GestureDetector.OnDoubl
 				}

 			}

 			

-			WebView web = (WebView)view.findViewById(R.id.content);

+			TitleBarWebView web = (TitleBarWebView)view.findViewById(R.id.content);

 			

 			if (web != null) {

+				if (m_activity.isSmallScreen()) {

+					View header = view.findViewById(R.id.article_header);

+					LinearLayout article = (LinearLayout)view.findViewById(R.id.article_fragment);

+					article.removeView(header);

+								

+					web.setEmbeddedTitleBarCompat(header);

+				}

+				

 				web.setWebChromeClient(new WebChromeClient() {					

 					@Override

 	                public void onProgressChanged(WebView view, int progress) {