diff options
| author | Andrew Dolgov <[email protected]> | 2012-06-26 21:45:35 +0400 |
|---|---|---|
| committer | Andrew Dolgov <[email protected]> | 2012-06-26 21:45:35 +0400 |
| commit | b80b684d12e31a962ac6bdc0e60c19687bc02d28 (patch) | |
| tree | 68c66ca11be202766e457862df109147e64b8f19 /src | |
| parent | 0702083fb2e7aada55f7a240d0d728e1efea3120 (diff) | |
set LayoutAlgorithm.SINGLE_COLUMN in webviews to fit images without css
hacks
Diffstat (limited to 'src')
| -rw-r--r-- | src/org/fox/ttrss/ArticleFragment.java | 9 | ||||
| -rw-r--r-- | src/org/fox/ttrss/offline/OfflineArticleFragment.java | 5 |
2 files changed, 8 insertions, 6 deletions
diff --git a/src/org/fox/ttrss/ArticleFragment.java b/src/org/fox/ttrss/ArticleFragment.java index 09bd0680..c3d83dd0 100644 --- a/src/org/fox/ttrss/ArticleFragment.java +++ b/src/org/fox/ttrss/ArticleFragment.java @@ -31,6 +31,7 @@ import android.view.View; import android.view.View.OnClickListener;
import android.view.ViewGroup;
import android.webkit.WebSettings;
+import android.webkit.WebSettings.LayoutAlgorithm;
import android.webkit.WebView;
import android.widget.ArrayAdapter;
import android.widget.Button;
@@ -109,6 +110,8 @@ public class ArticleFragment extends Fragment { ws.setSupportZoom(true);
ws.setBuiltInZoomControls(true);
+ web.getSettings().setLayoutAlgorithm(LayoutAlgorithm.SINGLE_COLUMN);
+
TypedValue tv = new TypedValue();
getActivity().getTheme().resolveAttribute(R.attr.linkColor, tv, true);
@@ -124,7 +127,7 @@ public class ArticleFragment extends Fragment { } else {
cssOverride = "";
}
-
+
String hexColor = String.format("#%06X", (0xFFFFFF & tv.data));
cssOverride += " a:link {color: "+hexColor+";} a:visited { color: "+hexColor+";}";
@@ -160,12 +163,10 @@ public class ArticleFragment extends Fragment { "<html>" +
"<head>" +
"<meta content=\"text/html; charset=utf-8\" http-equiv=\"content-type\">" +
- //"<meta name=\"viewport\" content=\"target-densitydpi=device-dpi\" />" +
"<style type=\"text/css\">" +
"body { padding : 0px; margin : 0px; }" +
cssOverride +
- "div.attachments { font-size : 70%; margin-top : 1em; }" +
- "img { max-width : 98%; height : auto; }" +
+ /* "img { max-width : 98%; height : auto; }" + */
"</style>" +
"</head>" +
"<body>" + articleContent;
diff --git a/src/org/fox/ttrss/offline/OfflineArticleFragment.java b/src/org/fox/ttrss/offline/OfflineArticleFragment.java index bfeb094c..ebe11fc8 100644 --- a/src/org/fox/ttrss/offline/OfflineArticleFragment.java +++ b/src/org/fox/ttrss/offline/OfflineArticleFragment.java @@ -27,6 +27,7 @@ import android.view.View; import android.view.ViewGroup;
import android.webkit.WebSettings;
import android.webkit.WebView;
+import android.webkit.WebSettings.LayoutAlgorithm;
import android.widget.TextView;
public class OfflineArticleFragment extends Fragment {
@@ -101,6 +102,8 @@ public class OfflineArticleFragment extends Fragment { WebSettings ws = web.getSettings();
ws.setSupportZoom(true);
ws.setBuiltInZoomControls(true);
+
+ web.getSettings().setLayoutAlgorithm(LayoutAlgorithm.SINGLE_COLUMN);
TypedValue tv = new TypedValue();
getActivity().getTheme().resolveAttribute(R.attr.linkColor, tv, true);
@@ -167,11 +170,9 @@ public class OfflineArticleFragment extends Fragment { "<html>" +
"<head>" +
"<meta content=\"text/html; charset=utf-8\" http-equiv=\"content-type\">" +
- //"<meta name=\"viewport\" content=\"target-densitydpi=device-dpi\" />" +
"<style type=\"text/css\">" +
"body { padding : 0px; margin : 0px; }" +
cssOverride +
- "img { max-width : 98%; height : auto; }" +
"</style>" +
"</head>" +
"<body>" + articleContent + "</body></html>";
|