diff options
| author | Andrew Dolgov <[email protected]> | 2013-11-14 22:37:58 +0400 |
|---|---|---|
| committer | Andrew Dolgov <[email protected]> | 2013-11-14 22:37:58 +0400 |
| commit | 4ab63ea6b8480551c371b50cf242b5ac1a9bf6a5 (patch) | |
| tree | 201b09963b0f6356c491a8ee7ece6dca6ec3bc9f | |
| parent | b5f28adf3c189930326ef80d8aa4d783d1a4fcad (diff) | |
add wide image workaround for 4.4 (getting real tired of this shit,
google)
| -rw-r--r-- | AndroidManifest.xml | 4 | ||||
| -rw-r--r-- | src/org/fox/ttrss/ArticleFragment.java | 6 | ||||
| -rw-r--r-- | src/org/fox/ttrss/offline/OfflineArticleFragment.java | 5 |
3 files changed, 12 insertions, 3 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 69589fcf..cc212e7a 100644 --- a/AndroidManifest.xml +++ b/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="218" - android:versionName="1.22" > + android:versionCode="219" + android:versionName="1.23" > <uses-sdk android:minSdkVersion="8" diff --git a/src/org/fox/ttrss/ArticleFragment.java b/src/org/fox/ttrss/ArticleFragment.java index cce77491..3b2fda84 100644 --- a/src/org/fox/ttrss/ArticleFragment.java +++ b/src/org/fox/ttrss/ArticleFragment.java @@ -255,6 +255,10 @@ public class ArticleFragment extends Fragment implements GestureDetector.OnDoubl break; } + if (android.os.Build.VERSION.SDK_INT > android.os.Build.VERSION_CODES.JELLY_BEAN_MR1) { + cssOverride += "img { max-width : 99%; }"; + } + content = "<html>" + "<head>" + @@ -262,7 +266,7 @@ public class ArticleFragment extends Fragment implements GestureDetector.OnDoubl "<style type=\"text/css\">" + "body { padding : 0px; margin : 0px; }" + cssOverride + - /* "img { max-width : 98%; height : auto; }" + */ + "body { line-height : 120%; }" + "</style>" + "</head>" + "<body>" + articleContent; diff --git a/src/org/fox/ttrss/offline/OfflineArticleFragment.java b/src/org/fox/ttrss/offline/OfflineArticleFragment.java index ae3343f5..da65cb2f 100644 --- a/src/org/fox/ttrss/offline/OfflineArticleFragment.java +++ b/src/org/fox/ttrss/offline/OfflineArticleFragment.java @@ -282,6 +282,10 @@ public class OfflineArticleFragment extends Fragment implements GestureDetector. break; } + if (android.os.Build.VERSION.SDK_INT > android.os.Build.VERSION_CODES.JELLY_BEAN_MR1) { + cssOverride += "img { max-width : 99%; }"; + } + content = "<html>" + "<head>" + @@ -289,6 +293,7 @@ public class OfflineArticleFragment extends Fragment implements GestureDetector. "<style type=\"text/css\">" + "body { padding : 0px; margin : 0px; }" + cssOverride + + "body { line-height : 120%; }" + "</style>" + "</head>" + "<body>" + articleContent; |