summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Dolgov <[email protected]>2018-03-08 13:15:54 +0300
committerAndrew Dolgov <[email protected]>2018-03-08 13:15:54 +0300
commit5d00fcf9076c2adce2a7ef6b2cef291bf36c8820 (patch)
treee81bfbd05662328d9f11f95c32700f1e582e22af
parent5bf0da447e001f68fdaa91f27eb967838f88a6e6 (diff)
initial set of changes to target SDK 27
-rwxr-xr-xbuild.gradle4
-rw-r--r--gradle/wrapper/gradle-wrapper.properties4
-rwxr-xr-xorg.fox.ttrss/build.gradle20
-rwxr-xr-xorg.fox.ttrss/src/main/java/org/fox/ttrss/CommonActivity.java11
-rwxr-xr-xorg.fox.ttrss/src/main/res/layout/headlines_row.xml4
-rwxr-xr-xorg.fox.ttrss/src/main/res/layout/headlines_row_unread.xml4
-rwxr-xr-x[-rw-r--r--]tt-rss-android.iml2
7 files changed, 24 insertions, 25 deletions
diff --git a/build.gradle b/build.gradle
index ae5a0eb1..441d42e0 100755
--- a/build.gradle
+++ b/build.gradle
@@ -2,9 +2,10 @@
buildscript {
repositories {
jcenter()
+ google()
}
dependencies {
- classpath 'com.android.tools.build:gradle:2.3.3'
+ classpath 'com.android.tools.build:gradle:3.0.1'
}
}
@@ -13,5 +14,6 @@ allprojects {
maven { url "http://dl.bintray.com/populov/maven" }
maven { url "http://jzaccone.github.io/SlidingMenu-aar" }
jcenter()
+ google()
}
}
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 909ab337..f102298b 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Mon May 29 14:03:50 MSK 2017
+#Thu Mar 08 12:50:31 MSK 2018
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip
diff --git a/org.fox.ttrss/build.gradle b/org.fox.ttrss/build.gradle
index cabd2045..e65aa406 100755
--- a/org.fox.ttrss/build.gradle
+++ b/org.fox.ttrss/build.gradle
@@ -1,14 +1,14 @@
apply plugin: 'com.android.application'
android {
- compileSdkVersion 25
- buildToolsVersion "25.0.3"
+ compileSdkVersion 27
+ buildToolsVersion "27.0.3"
defaultConfig {
applicationId "org.fox.ttrss"
buildConfigField "long", "TIMESTAMP", System.currentTimeMillis() + "L"
minSdkVersion 16
- targetSdkVersion 23 // we're not targeting SDK 25 because of this: https://issuetracker.google.com/issues/37103380#makechanges
+ targetSdkVersion 27 // we're not targeting SDK 25 because of this: https://issuetracker.google.com/issues/37103380#makechanges
}
lintOptions {
@@ -36,13 +36,13 @@ dependencies {
compile 'com.bogdwellers:pinchtozoom:0.1'
compile 'com.github.bumptech.glide:glide:3.8.0'
compile 'jp.wasabeef:glide-transformations:2.0.2'
- compile 'com.android.support:recyclerview-v7:25.3.1'
- compile 'com.android.support:cardview-v7:25.3.1'
- compile 'com.android.support:support-v4:25.3.1'
- compile 'com.android.support:appcompat-v7:25.3.1'
- compile 'com.android.support:customtabs:25.3.1'
- compile 'com.android.support:design:25.3.1'
- compile 'com.google.code.gson:gson:2.7'
+ compile 'com.android.support:recyclerview-v7:27.1.0'
+ compile 'com.android.support:cardview-v7:27.1.0'
+ compile 'com.android.support:support-v4:27.1.0'
+ compile 'com.android.support:appcompat-v7:27.1.0'
+ compile 'com.android.support:customtabs:27.1.0'
+ compile 'com.android.support:design:27.1.0'
+ compile 'com.google.code.gson:gson:2.8.0'
compile 'com.shamanland:fab:0.0.8'
compile 'ch.acra:acra:4.9.1'
compile 'com.ToxicBakery.viewpager.transforms:view-pager-transforms:1.2.32@aar'
diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/CommonActivity.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/CommonActivity.java
index 6aef10ea..41a2cc19 100755
--- a/org.fox.ttrss/src/main/java/org/fox/ttrss/CommonActivity.java
+++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/CommonActivity.java
@@ -27,14 +27,13 @@ import android.support.customtabs.CustomTabsIntent;
import android.support.customtabs.CustomTabsServiceConnection;
import android.support.customtabs.CustomTabsSession;
import android.support.design.widget.Snackbar;
-import android.support.v7.app.ActionBarActivity;
+import android.support.v7.app.AppCompatActivity;
import android.text.TextUtils;
import android.util.Log;
import android.util.TypedValue;
import android.view.Display;
import android.view.View;
import android.widget.CheckBox;
-import android.widget.Toast;
import com.bumptech.glide.Glide;
@@ -44,13 +43,11 @@ import org.jsoup.Jsoup;
import org.jsoup.nodes.Document;
import org.jsoup.select.Elements;
-import java.io.File;
-import java.io.IOException;
-import java.util.Arrays;
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.List;
-public class CommonActivity extends ActionBarActivity implements SharedPreferences.OnSharedPreferenceChangeListener {
+public class CommonActivity extends AppCompatActivity implements SharedPreferences.OnSharedPreferenceChangeListener {
private final String TAG = this.getClass().getSimpleName();
public final static String FRAG_HEADLINES = "headlines";
@@ -416,7 +413,7 @@ public class CommonActivity extends ActionBarActivity implements SharedPreferenc
if (askEveryTime) {
View dialogView = View.inflate(this, R.layout.dialog_open_link_askcb, null);
- final CheckBox askEveryTimeCB = (CheckBox) dialogView.findViewById(R.id.open_link_ask_checkbox);
+ final CheckBox askEveryTimeCB = dialogView.findViewById(R.id.open_link_ask_checkbox);
AlertDialog.Builder builder = new AlertDialog.Builder(
CommonActivity.this)
diff --git a/org.fox.ttrss/src/main/res/layout/headlines_row.xml b/org.fox.ttrss/src/main/res/layout/headlines_row.xml
index c4540cb0..a57b6953 100755
--- a/org.fox.ttrss/src/main/res/layout/headlines_row.xml
+++ b/org.fox.ttrss/src/main/res/layout/headlines_row.xml
@@ -59,13 +59,13 @@
<TextureView
android:id="@+id/flavor_video"
- android:foreground="@drawable/ripple"
+ android:foreground="@null"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_centerHorizontal="true"
android:layout_gravity="center"
android:adjustViewBounds="true"
- android:background="@android:color/transparent"
+ android:background="@null"
android:cropToPadding="true"
android:src="@drawable/drawer_header"
android:scaleType="fitCenter"
diff --git a/org.fox.ttrss/src/main/res/layout/headlines_row_unread.xml b/org.fox.ttrss/src/main/res/layout/headlines_row_unread.xml
index 62fd842b..8c09cc2a 100755
--- a/org.fox.ttrss/src/main/res/layout/headlines_row_unread.xml
+++ b/org.fox.ttrss/src/main/res/layout/headlines_row_unread.xml
@@ -60,13 +60,13 @@
<TextureView
android:id="@+id/flavor_video"
- android:foreground="@drawable/ripple"
+ android:foreground="@null"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_centerHorizontal="true"
android:layout_gravity="center"
android:adjustViewBounds="true"
- android:background="@android:color/transparent"
+ android:background="@null"
android:cropToPadding="true"
android:src="@drawable/drawer_header"
android:scaleType="fitCenter"
diff --git a/tt-rss-android.iml b/tt-rss-android.iml
index cbbdee2a..2f7cbe57 100644..100755
--- a/tt-rss-android.iml
+++ b/tt-rss-android.iml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id="tt-rss-android" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" external.system.module.group="" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
+<module external.linked.project.id="tt-rss-android" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" type="JAVA_MODULE" version="4">
<component name="FacetManager">
<facet type="java-gradle" name="Java-Gradle">
<configuration>