Dependency updates + Android N update

Author: Rolf-Smit

build.gradle

@@ -5,9 +5,9 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.1.2'
+        classpath 'com.android.tools.build:gradle:2.2.0'
         classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.6'
-        classpath 'com.github.dcendents:android-maven-gradle-plugin:1.3'
+        classpath 'com.github.dcendents:android-maven-gradle-plugin:1.4.1'
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
     }

demo/build.gradle

@@ -1,13 +1,13 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 23
+    compileSdkVersion 24
     buildToolsVersion "23.0.3"
 
     defaultConfig {
         applicationId "org.neotech.app.retainabletasksdemo"
-        minSdkVersion 8
-        targetSdkVersion 23
+        minSdkVersion 9
+        targetSdkVersion 24
         versionCode 1
         versionName "1.0"
     }
@@ -23,13 +23,13 @@ dependencies {
     compile project(':library')
     //compile 'org.neotech.library:android-retainable-tasks:0.1.0'
 
-    compile 'com.android.support:appcompat-v7:23.4.0'
-    compile 'com.android.support:design:23.4.0'
+    compile 'com.android.support:appcompat-v7:24.2.1'
+    compile 'com.android.support:design:24.2.1'
 
     //LeakCanary is used to detect memory leaks in debug builds.
-    debugCompile 'com.squareup.leakcanary:leakcanary-android:1.4-beta2'
-    releaseCompile 'com.squareup.leakcanary:leakcanary-android-no-op:1.4-beta2'
-    testCompile 'com.squareup.leakcanary:leakcanary-android-no-op:1.4-beta2'
+    debugCompile 'com.squareup.leakcanary:leakcanary-android:1.5'
+    releaseCompile 'com.squareup.leakcanary:leakcanary-android-no-op:1.5'
+    testCompile 'com.squareup.leakcanary:leakcanary-android-no-op:1.5'
 
     //Unit-testing
     testCompile 'junit:junit:4.12'

demo/src/main/java/org/neotech/app/retainabletasksdemo/ExtendedHtml.java

@@ -1,6 +1,11 @@
 package org.neotech.app.retainabletasksdemo;
 
+import android.graphics.Typeface;
+import android.os.Build;
+import android.os.Parcel;
+import android.os.Parcelable;
 import android.support.annotation.NonNull;
+import android.support.design.internal.ParcelableSparseArray;
 import android.text.Editable;
 import android.text.Html;
 import android.text.Spannable;
@@ -16,10 +21,24 @@
  */
 public final class ExtendedHtml {
 
+    public static final int FROM_HTML_MODE_LEGACY = Build.VERSION.SDK_INT >= Build.VERSION_CODES.N?Html.FROM_HTML_MODE_LEGACY:0;
+    public static final int FROM_HTML_MODE_COMPACT = Build.VERSION.SDK_INT >= Build.VERSION_CODES.N?Html.FROM_HTML_MODE_COMPACT:0;
+    public static final int FROM_HTML_OPTION_USE_CSS_COLORS = Build.VERSION.SDK_INT >= Build.VERSION_CODES.N?Html.FROM_HTML_OPTION_USE_CSS_COLORS:0;
+    public static final int FROM_HTML_SEPARATOR_LINE_BREAK_BLOCKQUOTE = Build.VERSION.SDK_INT >= Build.VERSION_CODES.N?Html.FROM_HTML_SEPARATOR_LINE_BREAK_BLOCKQUOTE:0;
+    public static final int FROM_HTML_SEPARATOR_LINE_BREAK_DIV = Build.VERSION.SDK_INT >= Build.VERSION_CODES.N?Html.FROM_HTML_SEPARATOR_LINE_BREAK_DIV:0;
+    public static final int FROM_HTML_SEPARATOR_LINE_BREAK_HEADING = Build.VERSION.SDK_INT >= Build.VERSION_CODES.N?Html.FROM_HTML_SEPARATOR_LINE_BREAK_HEADING:0;
+    public static final int FROM_HTML_SEPARATOR_LINE_BREAK_LIST = Build.VERSION.SDK_INT >= Build.VERSION_CODES.N?Html.FROM_HTML_SEPARATOR_LINE_BREAK_LIST:0;
+    public static final int FROM_HTML_SEPARATOR_LINE_BREAK_LIST_ITEM = Build.VERSION.SDK_INT >= Build.VERSION_CODES.N?Html.FROM_HTML_SEPARATOR_LINE_BREAK_LIST_ITEM:0;
+    public static final int FROM_HTML_SEPARATOR_LINE_BREAK_PARAGRAPH = Build.VERSION.SDK_INT >= Build.VERSION_CODES.N?Html.FROM_HTML_SEPARATOR_LINE_BREAK_PARAGRAPH:0;
+
     private static final ExtendedTagHandler TAG_HANDLER = new ExtendedTagHandler();
 
-    public static Spanned fromHtml(String source){
-        return Html.fromHtml(source, null, TAG_HANDLER);
+    public static Spanned fromHtml(String source, int flags){
+        if(Build.VERSION.SDK_INT >= Build.VERSION_CODES.N){
+            return Html.fromHtml(source, flags, null, TAG_HANDLER);
+        } else {
+            return Html.fromHtml(source, null, TAG_HANDLER);
+        }
     }
 
     private static class CodeSpan extends TypefaceSpan {
@@ -31,6 +50,11 @@ public CodeSpan(int backgroundColor){
             this.backgroundColor = backgroundColor;
         }
 
+        protected CodeSpan(Parcel in) {
+            super(in);
+            this.backgroundColor = in.readInt();
+        }
+
         @Override
         public void updateDrawState(TextPaint tp) {
             super.updateDrawState(tp);
@@ -42,14 +66,37 @@ public void updateMeasureState(TextPaint paint) {
             super.updateMeasureState(paint);
             paint.bgColor = backgroundColor;
         }
+
+        public static final Creator<CodeSpan> CREATOR = new Creator<CodeSpan>() {
+
+            @Override
+            public CodeSpan createFromParcel(Parcel in) {
+                return new CodeSpan(in);
+            }
+
+            @Override
+            public CodeSpan[] newArray(int size) {
+                return new CodeSpan[size];
+            }
+        };
+
+        @Override
+        public void writeToParcel(Parcel dest, int flags) {
+            super.writeToParcel(dest, flags);
+            dest.writeInt(backgroundColor);
+        }
+
+        public int describeContents() {
+            return 0;
+        }
     }
 
     /**
      * Based on: http://stackoverflow.com/questions/4044509/android-how-to-use-the-html-taghandler
      */
     private static class ExtendedTagHandler implements Html.TagHandler {
 
-        private static final int COLOR = 0xFFCCCCCC;
+        private static final int COLOR = 0xFFDDDDDD;
 
         @Override
         public void handleTag(boolean opening, String tag, Editable output, XMLReader xmlReader) {

demo/src/main/java/org/neotech/app/retainabletasksdemo/activity/Main.java

@@ -8,6 +8,7 @@
 import android.support.annotation.NonNull;
 import android.support.v7.app.AppCompatActivity;
 import android.support.v7.widget.Toolbar;
+import android.text.Html;
 import android.text.Spanned;
 import android.view.LayoutInflater;
 import android.view.Menu;
@@ -40,7 +41,6 @@ public class Main extends TaskActivityCompat implements Task.Callback {
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_main);
-       // setSupportActionBar((Toolbar) findViewById(R.id.toolbar));
 
         vSwitcher = (ViewSwitcher) findViewById(R.id.switcher);
         list = (ListView) findViewById(android.R.id.list);
@@ -182,7 +182,6 @@ public View getView(int position, View convertView, ViewGroup parent) {
             return convertView;
         }
 
-
         @Override
         public void onClick(View v) {
             v.getContext().startActivity((Intent) v.getTag());
@@ -198,8 +197,8 @@ private static class Demo {
         public Demo(Context context, int titleResId, int descriptionResId, String uri, Intent intent){
             this.intentStart = intent;
             this.intentView = new Intent(Intent.ACTION_VIEW, Uri.parse("https://github.com/NeoTech-Software/Android-Retainable-Tasks/tree/master/demo/src/main/java/" + uri));
-            this.title = ExtendedHtml.fromHtml(context.getString(titleResId));
-            this.description = ExtendedHtml.fromHtml(context.getString(descriptionResId));
+            this.title = ExtendedHtml.fromHtml(context.getString(titleResId), ExtendedHtml.FROM_HTML_MODE_LEGACY);
+            this.description = ExtendedHtml.fromHtml(context.getString(descriptionResId), ExtendedHtml.FROM_HTML_MODE_LEGACY);
         }
     }
 }

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Thu Apr 28 17:08:46 CEST 2016
+#Mon Oct 03 15:46:44 CEST 2016
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.10-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip

library/build.gradle

@@ -36,12 +36,12 @@ group = publishedGroupId
 version = libraryVersion
 
 android {
-    compileSdkVersion 23
+    compileSdkVersion 24
     buildToolsVersion "23.0.3"
 
     defaultConfig {
         minSdkVersion 8
-        targetSdkVersion 23
+        targetSdkVersion 24
         versionCode 1
         versionName = libraryVersion
     }
@@ -60,8 +60,8 @@ configurations {
 dependencies {
     compile fileTree(dir: 'libs', include: ['*.jar'])
     testCompile 'junit:junit:4.12'
-    compile 'com.android.support:appcompat-v7:23.4.0'
-    javadocCompile 'com.android.support:appcompat-v7:23.4.0'
+    compile 'com.android.support:appcompat-v7:24.2.1'
+    javadocCompile 'com.android.support:appcompat-v7: 24.2.1'
 }
 
 apply from: 'publish-library.gradle'

library/src/main/java/org/neotech/library/retainabletasks/internal/BaseTaskManager.java

@@ -160,7 +160,7 @@ public boolean isResultDelivered(@NonNull String tag) {
     @Override
     @MainThread
     public boolean isRunning(@NonNull String tag) {
-        if(TaskManager.isStrictDebugModeEnabled()){
+        if (TaskManager.isStrictDebugModeEnabled()) {
             assertMainThread();
         }
         Task task = tasks.get(tag);