diff --git a/res/values/arrays.xml b/res/values/arrays.xml
index 63e90184..b26a97a5 100644
--- a/res/values/arrays.xml
+++ b/res/values/arrays.xml
@@ -11,16 +11,6 @@
- THEME_LIGHT
- THEME_SEPIA
-
- - @string/font_size_small
- - @string/font_size_medium
- - @string/font_size_large
-
-
- - 0
- - 1
- - 2
-
- @string/category_browse_headlines
- @string/category_browse_articles
diff --git a/res/xml/preferences.xml b/res/xml/preferences.xml
index ec74841a..addf8852 100644
--- a/res/xml/preferences.xml
+++ b/res/xml/preferences.xml
@@ -103,21 +103,18 @@
android:summary="@string/pref_headlines_mark_read_scroll_long"
android:title="@string/pref_headlines_mark_read_scroll" />
-
-
-
android.os.Build.VERSION_CODES.JELLY_BEAN_MR1) {
- cssOverride += "img { max-width : 99%; }";
- }
+ ws.setDefaultFontSize(Integer.parseInt(m_prefs.getString("article_font_size_sp", "16")));
content =
"" +
"" +
"" +
+ "" +
"" +
"" +
"" + articleContent;
diff --git a/src/org/fox/ttrss/HeadlinesFragment.java b/src/org/fox/ttrss/HeadlinesFragment.java
index a8baa915..13429ec0 100644
--- a/src/org/fox/ttrss/HeadlinesFragment.java
+++ b/src/org/fox/ttrss/HeadlinesFragment.java
@@ -732,22 +732,8 @@ public class HeadlinesFragment extends Fragment implements OnItemClickListener,
if (excerpt.length() > CommonActivity.EXCERPT_MAX_SIZE)
excerpt = excerpt.substring(0, CommonActivity.EXCERPT_MAX_SIZE) + "...";
-
- int fontSize = -1;
- switch (Integer.parseInt(m_prefs.getString("headlines_font_size", "0"))) {
- case 0:
- fontSize = 13;
- break;
- case 1:
- fontSize = 16;
- break;
- case 2:
- fontSize = 18;
- break;
- }
-
- te.setTextSize(TypedValue.COMPLEX_UNIT_SP, fontSize);
+ te.setTextSize(TypedValue.COMPLEX_UNIT_SP, Integer.parseInt(m_prefs.getString("headlines_font_size_sp", "13")));
te.setText(excerpt);
}
}
diff --git a/src/org/fox/ttrss/offline/OfflineArticleFragment.java b/src/org/fox/ttrss/offline/OfflineArticleFragment.java
index de50d42c..a1033aec 100644
--- a/src/org/fox/ttrss/offline/OfflineArticleFragment.java
+++ b/src/org/fox/ttrss/offline/OfflineArticleFragment.java
@@ -29,17 +29,14 @@ import android.util.Log;
import android.util.TypedValue;
import android.view.ContextMenu;
import android.view.ContextMenu.ContextMenuInfo;
-import android.view.GestureDetector;
import android.view.KeyEvent;
import android.view.LayoutInflater;
import android.view.MenuItem;
-import android.view.MotionEvent;
import android.view.View;
import android.view.View.OnClickListener;
import android.view.ViewGroup;
import android.webkit.WebChromeClient;
import android.webkit.WebSettings;
-import android.webkit.WebSettings.LayoutAlgorithm;
import android.webkit.WebView;
import android.webkit.WebView.HitTestResult;
import android.widget.TextView;
@@ -220,13 +217,7 @@ public class OfflineArticleFragment extends Fragment {
String cssOverride = "";
WebSettings ws = web.getSettings();
- ws.setSupportZoom(true);
- ws.setBuiltInZoomControls(true);
-
- if (!m_activity.isCompatMode())
- ws.setDisplayZoomControls(false);
-
- web.getSettings().setLayoutAlgorithm(LayoutAlgorithm.SINGLE_COLUMN);
+ ws.setSupportZoom(false);
TypedValue tv = new TypedValue();
getActivity().getTheme().resolveAttribute(R.attr.linkColor, tv, true);
@@ -290,30 +281,17 @@ public class OfflineArticleFragment extends Fragment {
cssOverride += "body { text-align : justify; } ";
}
- switch (Integer.parseInt(m_prefs.getString("font_size", "0"))) {
- case 0:
- ws.setDefaultFontSize(13);
- break;
- case 1:
- ws.setDefaultFontSize(16);
- break;
- case 2:
- ws.setDefaultFontSize(18);
- break;
- }
-
- if (android.os.Build.VERSION.SDK_INT > android.os.Build.VERSION_CODES.JELLY_BEAN_MR1) {
- cssOverride += "img { max-width : 99%; }";
- }
+ ws.setDefaultFontSize(Integer.parseInt(m_prefs.getString("article_font_size_sp", "16")));
content =
"" +
"" +
"" +
+ "" +
"" +
"" +
"" + articleContent;
diff --git a/src/org/fox/ttrss/offline/OfflineHeadlinesFragment.java b/src/org/fox/ttrss/offline/OfflineHeadlinesFragment.java
index 72892081..b4383319 100644
--- a/src/org/fox/ttrss/offline/OfflineHeadlinesFragment.java
+++ b/src/org/fox/ttrss/offline/OfflineHeadlinesFragment.java
@@ -568,22 +568,8 @@ public class OfflineHeadlinesFragment extends Fragment implements OnItemClickLis
if (excerpt.length() > CommonActivity.EXCERPT_MAX_SIZE)
excerpt = excerpt.substring(0, CommonActivity.EXCERPT_MAX_SIZE) + "...";
-
- int fontSize = -1;
- switch (Integer.parseInt(m_prefs.getString("headlines_font_size", "0"))) {
- case 0:
- fontSize = 13;
- break;
- case 1:
- fontSize = 16;
- break;
- case 2:
- fontSize = 18;
- break;
- }
-
- te.setTextSize(TypedValue.COMPLEX_UNIT_SP, fontSize);
+ te.setTextSize(TypedValue.COMPLEX_UNIT_SP, Integer.parseInt(m_prefs.getString("headlines_font_size_sp", "13")));
te.setText(excerpt);
}
}