diff options
5 files changed, 21 insertions, 6 deletions
diff --git a/org.fox.ttrss/src/main/AndroidManifest.xml b/org.fox.ttrss/src/main/AndroidManifest.xml index 520ba28d..4b2697ac 100755 --- a/org.fox.ttrss/src/main/AndroidManifest.xml +++ b/org.fox.ttrss/src/main/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="500" - android:versionName="1.266"> + android:versionCode="501" + android:versionName="1.267"> <uses-permission android:name="android.permission.INTERNET" /> <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" /> diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/ArticlePager.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/ArticlePager.java index 4fc53587..2f373f04 100755 --- a/org.fox.ttrss/src/main/java/org/fox/ttrss/ArticlePager.java +++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/ArticlePager.java @@ -338,8 +338,11 @@ public class ArticlePager extends StateSavedFragment { put("include_header", "true"); } - put("resize_width", String.valueOf(m_activity.getScreenWidth()/2)); - put("resize_enabled", String.valueOf(!m_activity.isWifiConnected())); + if (m_prefs.getBoolean("enable_image_downsampling", false)) { + if (!m_activity.isWifiConnected()) { + put("resize_width", String.valueOf(m_activity.getScreenWidth() * 0.75)); + } + } } }; diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/HeadlinesFragment.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/HeadlinesFragment.java index 7e483e11..fa53e714 100755 --- a/org.fox.ttrss/src/main/java/org/fox/ttrss/HeadlinesFragment.java +++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/HeadlinesFragment.java @@ -716,8 +716,12 @@ public class HeadlinesFragment extends StateSavedFragment { put("include_nested", "true"); put("has_sandbox", "true"); put("order_by", m_activity.getSortMode()); - put("resize_width", String.valueOf(m_activity.getScreenWidth()/2)); - put("resize_enabled", String.valueOf(!m_activity.isWifiConnected())); + + if (m_prefs.getBoolean("enable_image_downsampling", false)) { + if (!m_activity.isWifiConnected()) { + put("resize_width", String.valueOf(m_activity.getScreenWidth() * 0.75)); + } + } if (isCat) put("is_cat", "true"); diff --git a/org.fox.ttrss/src/main/res/values/strings.xml b/org.fox.ttrss/src/main/res/values/strings.xml index 56bc64c0..b73a3394 100755 --- a/org.fox.ttrss/src/main/res/values/strings.xml +++ b/org.fox.ttrss/src/main/res/values/strings.xml @@ -277,4 +277,6 @@ <string name="prefs_headline_images_wifi_only">Show images on Wi-Fi only</string> <string name="prefs_headline_images_wifi_only_long">Overrides previous setting</string> <string name="prefs_inline_video_player">Experimental. Long tap to open separate player</string> + <string name="prefs_enable_image_downsampling">Auto-resize images</string> + <string name="prefs_enable_image_downsampling_long">Asks backend to downsample images if not on Wi-Fi. Needs a plugin (ttrss-api-resize).</string> </resources> diff --git a/org.fox.ttrss/src/main/res/xml/preferences.xml b/org.fox.ttrss/src/main/res/xml/preferences.xml index 40e327cf..f6f9b9bc 100755 --- a/org.fox.ttrss/src/main/res/xml/preferences.xml +++ b/org.fox.ttrss/src/main/res/xml/preferences.xml @@ -122,6 +122,12 @@ <org.fox.ttrss.util.LessBrokenSwitchPreference android:defaultValue="false" + android:key="enable_image_downsampling" + android:title="@string/prefs_enable_image_downsampling" + android:summary="@string/prefs_enable_image_downsampling_long" /> + + <org.fox.ttrss.util.LessBrokenSwitchPreference + android:defaultValue="false" android:key="inline_video_player" android:summary="@string/prefs_inline_video_player" android:title="Inline video player" /> |