summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Dolgov <[email protected]>2011-12-19 14:08:40 +0300
committerAndrew Dolgov <[email protected]>2011-12-19 14:08:40 +0300
commiteb2d8f4ad590a6e08c8c8745dec112eed64fa2a2 (patch)
treeb2a14942a301c2105fc4848b8d51eea2276cda78
parent80a234cc15fb1e5dba088a17b3876bc62b8a7c0d (diff)
enable zoom controls in article webview, bump version
-rw-r--r--AndroidManifest.xml4
-rw-r--r--src/org/fox/ttrss/ArticleFragment.java7
-rw-r--r--src/org/fox/ttrss/OfflineArticleFragment.java7
3 files changed, 10 insertions, 8 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 4e621e15..73b86a7f 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="43"
- android:versionName="0.3.10" >
+ android:versionCode="44"
+ android:versionName="0.3.11" >
<uses-sdk android:minSdkVersion="7" />
diff --git a/src/org/fox/ttrss/ArticleFragment.java b/src/org/fox/ttrss/ArticleFragment.java
index 1d263fc5..ff26fc52 100644
--- a/src/org/fox/ttrss/ArticleFragment.java
+++ b/src/org/fox/ttrss/ArticleFragment.java
@@ -24,6 +24,7 @@ import android.view.MotionEvent;
import android.view.View;
import android.view.View.OnClickListener;
import android.view.ViewGroup;
+import android.webkit.WebSettings;
import android.webkit.WebView;
import android.widget.ImageView;
import android.widget.TextView;
@@ -106,9 +107,9 @@ public class ArticleFragment extends Fragment {
String cssOverride = "";
- //WebSettings ws = web.getSettings();
- //ws.setSupportZoom(true);
- //ws.setBuiltInZoomControls(true);
+ WebSettings ws = web.getSettings();
+ ws.setSupportZoom(true);
+ ws.setBuiltInZoomControls(true);
if (m_prefs.getString("theme", "THEME_DARK").equals("THEME_DARK")) {
cssOverride = "body { background : black; color : #e0e0e0}\n";
diff --git a/src/org/fox/ttrss/OfflineArticleFragment.java b/src/org/fox/ttrss/OfflineArticleFragment.java
index 4dc7a582..4886ecc0 100644
--- a/src/org/fox/ttrss/OfflineArticleFragment.java
+++ b/src/org/fox/ttrss/OfflineArticleFragment.java
@@ -27,6 +27,7 @@ import android.view.MotionEvent;
import android.view.View;
import android.view.View.OnClickListener;
import android.view.ViewGroup;
+import android.webkit.WebSettings;
import android.webkit.WebView;
import android.widget.ImageView;
import android.widget.TextView;
@@ -111,9 +112,9 @@ public class OfflineArticleFragment extends Fragment {
String cssOverride = "";
- //WebSettings ws = web.getSettings();
- //ws.setSupportZoom(true);
- //ws.setBuiltInZoomControls(true);
+ WebSettings ws = web.getSettings();
+ ws.setSupportZoom(true);
+ ws.setBuiltInZoomControls(true);
if (m_prefs.getString("theme", "THEME_DARK").equals("THEME_DARK")) {
cssOverride = "body { background : black; color : #e0e0e0}\n";