diff options
-rwxr-xr-x | build.gradle | 2 | ||||
-rw-r--r-- | gradle/wrapper/gradle-wrapper.properties | 4 | ||||
-rwxr-xr-x | org.fox.ttrss/build.gradle | 10 | ||||
-rwxr-xr-x | org.fox.ttrss/src/main/AndroidManifest.xml | 4 | ||||
-rwxr-xr-x | org.fox.ttrss/src/main/java/org/fox/ttrss/ArticlePager.java | 11 | ||||
-rwxr-xr-x | org.fox.ttrss/src/main/java/org/fox/ttrss/HeadlinesFragment.java | 23 | ||||
-rwxr-xr-x | org.fox.ttrss/src/main/res/values/strings.xml | 5 | ||||
-rwxr-xr-x | org.fox.ttrss/src/main/res/xml/preferences.xml | 9 |
8 files changed, 40 insertions, 28 deletions
diff --git a/build.gradle b/build.gradle index a19d8d96..254bf29d 100755 --- a/build.gradle +++ b/build.gradle @@ -5,7 +5,7 @@ buildscript { google() } dependencies { - classpath 'com.android.tools.build:gradle:3.3.0' + classpath 'com.android.tools.build:gradle:3.5.1' } } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index ec8e2026..549b7fbf 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Wed Feb 13 14:58:58 MSK 2019
+#Wed Oct 30 14:09:16 MSK 2019
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip
diff --git a/org.fox.ttrss/build.gradle b/org.fox.ttrss/build.gradle index c9f6a45d..8c2c7bde 100755 --- a/org.fox.ttrss/build.gradle +++ b/org.fox.ttrss/build.gradle @@ -1,7 +1,7 @@ apply plugin: 'com.android.application' android { - compileSdkVersion 28 + compileSdkVersion 29 buildToolsVersion "28.0.3" defaultConfig { @@ -9,7 +9,7 @@ android { buildConfigField "long", "TIMESTAMP", System.currentTimeMillis() + "L" buildConfigField "boolean", "ENABLE_TRIAL", "true" minSdkVersion 16 - targetSdkVersion 28 // we're not targeting SDK 25 because of this: https://issuetracker.google.com/issues/37103380#makechanges + targetSdkVersion 29 } signingConfigs { @@ -48,7 +48,7 @@ android { dependencies { implementation files('libs/dashclock-api-r1.1.jar') - implementation 'com.squareup.okhttp3:okhttp:3.10.0' + implementation 'com.squareup.okhttp3:okhttp:3.12.5' implementation('com.github.bumptech.glide:okhttp3-integration:1.5.0') { exclude group: 'glide-parent' } @@ -58,10 +58,10 @@ dependencies { implementation 'jp.wasabeef:glide-transformations:2.0.2' implementation 'androidx.recyclerview:recyclerview:1.0.0' implementation 'androidx.legacy:legacy-support-v4:1.0.0' - implementation 'androidx.appcompat:appcompat:1.0.2' + implementation 'androidx.appcompat:appcompat:1.1.0' implementation 'androidx.browser:browser:1.0.0' implementation 'com.google.android.material:material:1.0.0' - implementation 'com.google.code.gson:gson:2.8.2' + implementation 'com.google.code.gson:gson:2.8.5' implementation 'com.shamanland:fab:0.0.8' implementation 'com.ToxicBakery.viewpager.transforms:view-pager-transforms:1.2.32@aar' implementation 'me.relex:circleindicator:1.2.2@aar' diff --git a/org.fox.ttrss/src/main/AndroidManifest.xml b/org.fox.ttrss/src/main/AndroidManifest.xml index b73971d1..d2ac289f 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="505" - android:versionName="1.271"> + android:versionCode="506" + android:versionName="1.272"> <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 c885b732..e08934bd 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 @@ -13,6 +13,11 @@ import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; +import androidx.fragment.app.Fragment; +import androidx.fragment.app.FragmentManager; +import androidx.fragment.app.FragmentStatePagerAdapter; +import androidx.viewpager.widget.ViewPager; + import com.google.android.material.snackbar.Snackbar; import com.google.gson.JsonElement; import com.viewpagerindicator.UnderlinePageIndicator; @@ -24,10 +29,6 @@ import org.fox.ttrss.util.HeadlinesRequest; import java.util.HashMap; -import androidx.fragment.app.Fragment; -import androidx.fragment.app.FragmentManager; -import androidx.fragment.app.FragmentStatePagerAdapter; -import androidx.viewpager.widget.ViewPager; import icepick.State; public class ArticlePager extends StateSavedFragment { @@ -339,7 +340,7 @@ public class ArticlePager extends StateSavedFragment { } if (m_prefs.getBoolean("enable_image_downsampling", false)) { - if (!m_activity.isWifiConnected()) { + if (m_prefs.getBoolean("always_downsample_images", false) || !m_activity.isWifiConnected()) { put("resize_width", String.valueOf(m_activity.getResizeWidth())); } } 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 933c4b28..ac94d420 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 @@ -50,6 +50,17 @@ import android.widget.ProgressBar; import android.widget.RelativeLayout; import android.widget.TextView; +import androidx.appcompat.app.ActionBar; +import androidx.core.app.ActivityCompat; +import androidx.core.app.ActivityOptionsCompat; +import androidx.core.view.ViewCompat; +import androidx.recyclerview.widget.DefaultItemAnimator; +import androidx.recyclerview.widget.DividerItemDecoration; +import androidx.recyclerview.widget.ItemTouchHelper; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; +import androidx.swiperefreshlayout.widget.SwipeRefreshLayout; + import com.amulyakhare.textdrawable.TextDrawable; import com.amulyakhare.textdrawable.util.ColorGenerator; import com.bumptech.glide.Glide; @@ -81,16 +92,6 @@ import java.util.HashMap; import java.util.List; import java.util.TimeZone; -import androidx.appcompat.app.ActionBar; -import androidx.core.app.ActivityCompat; -import androidx.core.app.ActivityOptionsCompat; -import androidx.core.view.ViewCompat; -import androidx.recyclerview.widget.DefaultItemAnimator; -import androidx.recyclerview.widget.DividerItemDecoration; -import androidx.recyclerview.widget.ItemTouchHelper; -import androidx.recyclerview.widget.LinearLayoutManager; -import androidx.recyclerview.widget.RecyclerView; -import androidx.swiperefreshlayout.widget.SwipeRefreshLayout; import icepick.State; import jp.wasabeef.glide.transformations.CropCircleTransformation; @@ -718,7 +719,7 @@ public class HeadlinesFragment extends StateSavedFragment { put("order_by", m_activity.getSortMode()); if (m_prefs.getBoolean("enable_image_downsampling", false)) { - if (!m_activity.isWifiConnected()) { + if (m_prefs.getBoolean("always_downsample_images", false) || !m_activity.isWifiConnected()) { put("resize_width", String.valueOf(m_activity.getResizeWidth())); } } diff --git a/org.fox.ttrss/src/main/res/values/strings.xml b/org.fox.ttrss/src/main/res/values/strings.xml index 4cf36455..a0b0f0b4 100755 --- a/org.fox.ttrss/src/main/res/values/strings.xml +++ b/org.fox.ttrss/src/main/res/values/strings.xml @@ -278,5 +278,8 @@ <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> + <string name="prefs_enable_image_downsampling_long">Asks backend to downsample images if not on Wi-Fi. Needs a plugin (ttrss-api-resize)</string> + <string name="prefs_always_downsample_images">Always resize images</string> + <string name="prefs_always_downsample_images_long">Even on Wi-Fi</string> + <string name="prefs_inline_video_player_title">Inline video player</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 f6f9b9bc..f20bb2cc 100755 --- a/org.fox.ttrss/src/main/res/xml/preferences.xml +++ b/org.fox.ttrss/src/main/res/xml/preferences.xml @@ -128,9 +128,16 @@ <org.fox.ttrss.util.LessBrokenSwitchPreference android:defaultValue="false" + android:key="always_downsample_images" + android:dependency="enable_image_downsampling" + android:title="@string/prefs_always_downsample_images" + android:summary="@string/prefs_always_downsample_images_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" /> + android:title="@string/prefs_inline_video_player_title" /> </PreferenceCategory> |