Skip to content

Commit

Permalink
Version 1.90
Browse files Browse the repository at this point in the history
 * Bugifx-release: Fix FC while parsing new output from server api (added field for GUID)
 * Fixed ResourceType IDs passed to setCustomAnimations()
 * Updated build-system to SDK 24
  • Loading branch information
Nils Braden committed Aug 12, 2016
1 parent 6b3bd38 commit 79f7d7c
Show file tree
Hide file tree
Showing 5 changed files with 24 additions and 21 deletions.
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ buildscript {
mavenCentral()
}
dependencies {
classpath 'com.android.tools.build:gradle:2.0.0'
classpath 'com.android.tools.build:gradle:2.1.0'
// NOTE: Do not place your application dependencies here; they belong in the individual module build.gradle files
}
}
Expand Down
14 changes: 7 additions & 7 deletions ttrssreader/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,13 @@
apply plugin: 'com.android.application'

android {
compileSdkVersion 23
buildToolsVersion "23.0.3"
compileSdkVersion 24
buildToolsVersion "24.0.1"

defaultConfig {
applicationId "org.ttrssreader"
minSdkVersion 14
targetSdkVersion 23
targetSdkVersion 24
}

buildTypes {
Expand Down Expand Up @@ -59,9 +59,9 @@ dependencies {
compile 'net.sourceforge.htmlcleaner:htmlcleaner:2.5'
compile 'org.antlr:ST4:4.0.8'
compile 'com.google.guava:guava:18.0'
// Use Material Design everywhere
compile 'com.android.support:appcompat-v7:23.3.0'
compile 'com.android.support:recyclerview-v7:23.3.0'
// Use Material Design everywhere, see here for latest versions: https://developer.android.com/topic/libraries/support-library/features.html#v7
compile 'com.android.support:appcompat-v7:24.1.1'
compile 'com.android.support:recyclerview-v7:24.1.1'
// For @Nullable/@NonNull
compile 'com.intellij:annotations:12.0'
// Remove any potentially harmful script-tags from incoming content
Expand All @@ -70,6 +70,6 @@ dependencies {
// "Updating Your Security Provider to Protect Against SSL Exploits"
// https://developer.android.com/training/articles/security-gms-provider.html
// Only used in productFlavour "play"
playCompile 'com.google.android.gms:play-services-base:8.4.0'
playCompile 'com.google.android.gms:play-services-base:9.2.0'
}

2 changes: 1 addition & 1 deletion ttrssreader/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
xmlns:tools="http://schemas.android.com/tools"
android:installLocation="internalOnly"
android:versionCode="1890"
android:versionName="1.89.0">
android:versionName="1.90.0">

<!-- Check connectivity -->
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
Expand Down
24 changes: 12 additions & 12 deletions ttrssreader/src/main/java/org/ttrssreader/gui/CategoryActivity.java
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,17 @@
package org.ttrssreader.gui;


import android.app.FragmentManager;
import android.app.FragmentTransaction;
import android.content.Context;
import android.content.Intent;
import android.net.ConnectivityManager;
import android.os.Bundle;
import android.util.Log;
import android.view.Menu;
import android.view.MenuItem;
import android.widget.Toast;

import org.ttrssreader.R;
import org.ttrssreader.controllers.Controller;
import org.ttrssreader.controllers.DBHelper;
Expand All @@ -33,17 +44,6 @@
import org.ttrssreader.utils.AsyncTask;
import org.ttrssreader.utils.Utils;

import android.app.FragmentManager;
import android.app.FragmentTransaction;
import android.content.Context;
import android.content.Intent;
import android.net.ConnectivityManager;
import android.os.Bundle;
import android.util.Log;
import android.view.Menu;
import android.view.MenuItem;
import android.widget.Toast;

import java.util.LinkedHashSet;
import java.util.Set;

Expand Down Expand Up @@ -342,7 +342,7 @@ public void displayFeed(int categoryId) {

// Animation
if (Controller.isTablet)
ft.setCustomAnimations(android.R.anim.slide_in_left, android.R.anim.fade_out, android.R.anim.fade_in,
ft.setCustomAnimations(R.animator.slide_in_left, android.R.animator.fade_out, android.R.animator.fade_in,
R.animator.slide_out_left);
else ft.setTransition(FragmentTransaction.TRANSIT_FRAGMENT_FADE);

Expand Down
3 changes: 3 additions & 0 deletions ttrssreader/src/main/res/values/update.xml
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,9 @@
<resources>

<string-array name="updates">
<item>Version 1.90
* Bugifx-release: Fix FC while parsing new output from server api (added field for GUID)
</item>
<item>Version 1.89
* Fixed errors when ImageCache couldn\'t be accessed
* Fixed some problems with external storage access
Expand Down

0 comments on commit 79f7d7c

Please sign in to comment.