Added HTML changelog support

app/build.gradle

@@ -1,16 +1,15 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 27
-    buildToolsVersion "27.0.3"
+    compileSdkVersion 33
 
     defaultConfig {
         applicationId "com.github.javiersantos.appupdater.demo"
         minSdkVersion 14
-        targetSdkVersion 27
+        targetSdkVersion 33
         versionCode 4
         versionName "0.1"
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
     }
 
     buildTypes {
@@ -24,24 +23,23 @@ android {
         enabled = true
     }
 
-    lintOptions {
+    namespace 'com.github.javiersantos.appupdater.demo'
+    lint {
         disable 'MissingTranslation'
     }
 }
 
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
-    implementation 'com.android.support:appcompat-v7:27.1.1'
-    implementation 'com.android.support:design:27.1.1'
-    implementation 'com.android.support:cardview-v7:27.1.1'
+    implementation 'androidx.appcompat:appcompat:1.6.0'
+    implementation 'com.google.android.material:material:1.7.0'
+    implementation 'androidx.cardview:cardview:1.0.0'
     implementation project(':library')
 
     // Testing-only dependencies
-    testImplementation 'junit:junit:4.12'
-    androidTestImplementation('com.android.support.test:runner:1.0.1', {
-        exclude group: 'com.android.support', module: 'support-annotations'
-    })
-    androidTestImplementation('com.android.support.test.espresso:espresso-core:3.0.1', {
-        exclude group: 'com.android.support', module: 'support-annotations'
-    })
+    testImplementation 'junit:junit:4.13.2'
+    androidTestImplementation('androidx.test.ext:junit:1.1.5')
+
+    androidTestImplementation('androidx.test:core:1.5.0')
+    androidTestImplementation('androidx.test.espresso:espresso-core:3.5.1')
 }

app/src/androidTest/java/com/github/javiersantos/appupdater/LibraryTest.java

@@ -1,6 +1,5 @@
 package com.github.javiersantos.appupdater;
 
-import android.support.test.runner.AndroidJUnit4;
 
 import com.github.javiersantos.appupdater.objects.Update;
 
@@ -9,6 +8,8 @@
 
 import static org.junit.Assert.assertTrue;
 
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+
 @RunWith(AndroidJUnit4.class)
 public class LibraryTest {
 

app/src/androidTest/java/com/github/javiersantos/appupdater/NoUpdateAvailableTest.java

@@ -1,35 +1,32 @@
 package com.github.javiersantos.appupdater;
 
-import android.support.test.InstrumentationRegistry;
-import android.support.test.rule.UiThreadTestRule;
-import android.support.test.runner.AndroidJUnit4;
+
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
+import androidx.test.InstrumentationRegistry;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+import androidx.test.internal.runner.junit4.statement.UiThreadStatement;
 
 import com.github.javiersantos.appupdater.enums.AppUpdaterError;
 import com.github.javiersantos.appupdater.enums.UpdateFrom;
 import com.github.javiersantos.appupdater.objects.Update;
 
-import org.junit.Rule;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
 
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-
 @RunWith(AndroidJUnit4.class)
 public class NoUpdateAvailableTest {
 
-    @Rule
-    public UiThreadTestRule uiThreadTestRule = new UiThreadTestRule();
 
     @Test
     public void UpdateAvailable_Basic_JSON() throws Throwable {
         final CountDownLatch signal = new CountDownLatch(1);
 
-        uiThreadTestRule.runOnUiThread(new Runnable() {
+        UiThreadStatement.runOnUiThread(new Runnable() {
             @Override
             public void run() {
                 new AppUpdaterUtils(InstrumentationRegistry.getTargetContext())
@@ -59,7 +56,7 @@ public void onFailed(AppUpdaterError error) {
     public void UpdateAvailable_VersionCode_JSON() throws Throwable {
         final CountDownLatch signal = new CountDownLatch(1);
 
-        uiThreadTestRule.runOnUiThread(new Runnable() {
+        UiThreadStatement.runOnUiThread(new Runnable() {
             @Override
             public void run() {
                 new AppUpdaterUtils(InstrumentationRegistry.getTargetContext())
@@ -89,7 +86,7 @@ public void onFailed(AppUpdaterError error) {
     public void UpdateAvailable_Basic_XML() throws Throwable {
         final CountDownLatch signal = new CountDownLatch(1);
 
-        uiThreadTestRule.runOnUiThread(new Runnable() {
+        UiThreadStatement.runOnUiThread(new Runnable() {
             @Override
             public void run() {
                 new AppUpdaterUtils(InstrumentationRegistry.getTargetContext())
@@ -119,7 +116,7 @@ public void onFailed(AppUpdaterError error) {
     public void UpdateAvailable_VersionCode_XML() throws Throwable {
         final CountDownLatch signal = new CountDownLatch(1);
 
-        uiThreadTestRule.runOnUiThread(new Runnable() {
+        UiThreadStatement.runOnUiThread(new Runnable() {
             @Override
             public void run() {
                 new AppUpdaterUtils(InstrumentationRegistry.getTargetContext())

app/src/androidTest/java/com/github/javiersantos/appupdater/UpdateAvailableTest.java

@@ -4,10 +4,6 @@
 import com.github.javiersantos.appupdater.enums.UpdateFrom;
 import com.github.javiersantos.appupdater.objects.Update;
 
-import android.support.test.InstrumentationRegistry;
-import android.support.test.rule.UiThreadTestRule;
-import android.support.test.runner.AndroidJUnit4;
-
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -17,17 +13,19 @@
 
 import static org.junit.Assert.*;
 
+import androidx.test.InstrumentationRegistry;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+import androidx.test.internal.runner.junit4.statement.UiThreadStatement;
+
 @RunWith(AndroidJUnit4.class)
 public class UpdateAvailableTest {
 
-    @Rule
-    public UiThreadTestRule uiThreadTestRule = new UiThreadTestRule();
 
     @Test
     public void UpdateAvailable_Basic_JSON() throws Throwable {
         final CountDownLatch signal = new CountDownLatch(1);
 
-        uiThreadTestRule.runOnUiThread(new Runnable() {
+        UiThreadStatement.runOnUiThread(new Runnable() {
             @Override
             public void run() {
                 new AppUpdaterUtils(InstrumentationRegistry.getTargetContext())
@@ -57,7 +55,7 @@ public void onFailed(AppUpdaterError error) {
     public void UpdateAvailable_VersionCode_JSON() throws Throwable {
         final CountDownLatch signal = new CountDownLatch(1);
 
-        uiThreadTestRule.runOnUiThread(new Runnable() {
+        UiThreadStatement.runOnUiThread(new Runnable() {
             @Override
             public void run() {
                 new AppUpdaterUtils(InstrumentationRegistry.getTargetContext())
@@ -87,7 +85,7 @@ public void onFailed(AppUpdaterError error) {
     public void UpdateAvailable_Basic_XML() throws Throwable {
         final CountDownLatch signal = new CountDownLatch(1);
 
-        uiThreadTestRule.runOnUiThread(new Runnable() {
+        UiThreadStatement.runOnUiThread(new Runnable() {
             @Override
             public void run() {
                 new AppUpdaterUtils(InstrumentationRegistry.getTargetContext())
@@ -117,7 +115,7 @@ public void onFailed(AppUpdaterError error) {
     public void UpdateAvailable_VersionCode_XML() throws Throwable {
         final CountDownLatch signal = new CountDownLatch(1);
 
-        uiThreadTestRule.runOnUiThread(new Runnable() {
+        UiThreadStatement.runOnUiThread(new Runnable() {
             @Override
             public void run() {
                 new AppUpdaterUtils(InstrumentationRegistry.getTargetContext())
@@ -147,7 +145,7 @@ public void onFailed(AppUpdaterError error) {
     public void UpdateAvailable_GOOGLEPLAY() throws Throwable {
         final CountDownLatch signal = new CountDownLatch(1);
 
-        uiThreadTestRule.runOnUiThread(new Runnable() {
+        UiThreadStatement.runOnUiThread(new Runnable() {
             @Override
             public void run() {
                 new AppUpdaterUtils(InstrumentationRegistry.getTargetContext())
@@ -176,7 +174,7 @@ public void onFailed(AppUpdaterError error) {
     public void UpdateAvailable_JSON() throws Throwable {
         final CountDownLatch signal = new CountDownLatch(1);
 
-        uiThreadTestRule.runOnUiThread(new Runnable() {
+        UiThreadStatement.runOnUiThread(new Runnable() {
             @Override
             public void run() {
                 new AppUpdaterUtils(InstrumentationRegistry.getTargetContext())

app/src/main/AndroidManifest.xml

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.github.javiersantos.appupdater.demo">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
@@ -13,7 +12,8 @@
         android:theme="@style/AppTheme">
         <activity
             android:name=".MainActivity"
-            android:theme="@style/AppTheme.NoActionBar">
+            android:theme="@style/AppTheme.NoActionBar"
+            android:exported="true">
 
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />

app/src/main/java/com/github/javiersantos/appupdater/demo/MainActivity.java

@@ -2,15 +2,16 @@
 
 import android.content.Context;
 import android.content.Intent;
-import android.databinding.DataBindingUtil;
 import android.net.Uri;
 import android.os.Bundle;
-import android.support.v7.app.AppCompatActivity;
 import android.view.Menu;
 import android.view.MenuInflater;
 import android.view.MenuItem;
 import android.view.View;
 
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.databinding.DataBindingUtil;
+
 import com.github.javiersantos.appupdater.AppUpdater;
 import com.github.javiersantos.appupdater.demo.databinding.ActivityMainBinding;
 import com.github.javiersantos.appupdater.enums.Display;
@@ -33,14 +34,30 @@ public void onClick(View view) {
             }
         });
 
+        binding.included.dialogUpdateChangelogWebview.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                new AppUpdater(mContext)
+                        //.setUpdateFrom(UpdateFrom.GITHUB)
+                        //.setGitHubUserAndRepo("javiersantos", "AppUpdater")
+                        .setUpdateFrom(UpdateFrom.JSON)
+                        .setUpdateJSON("https://pastebin.com/raw/eHrKfPMn")
+                        .setDisplay(Display.DIALOG)
+                        .showAppUpdated(true)
+                        .setWebviewChangelog(true)
+                        //.setWebviewChangelog(true, "http://urltochangelog.com/changelog.html")
+                        .start();
+            }
+        });
+
         binding.included.dialogUpdateChangelog.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View view) {
                 new AppUpdater(mContext)
                         //.setUpdateFrom(UpdateFrom.GITHUB)
                         //.setGitHubUserAndRepo("javiersantos", "AppUpdater")
                         .setUpdateFrom(UpdateFrom.JSON)
-                        .setUpdateJSON("https://raw.githubusercontent.com/javiersantos/AppUpdater/master/app/update-changelog.json")
+                        .setUpdateJSON("https://pastebin.com/raw/eHrKfPMn")
                         .setDisplay(Display.DIALOG)
                         .showAppUpdated(true)
                         .start();

app/src/main/java/com/github/javiersantos/appupdater/demo/SettingsActivity.java

@@ -3,12 +3,12 @@
 import android.os.Bundle;
 import android.preference.Preference;
 import android.preference.PreferenceActivity;
-import android.support.v4.content.ContextCompat;
-import android.support.v7.widget.Toolbar;
+import androidx.core.content.ContextCompat;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.LinearLayout;
+import android.widget.Toolbar;
 
 import com.github.javiersantos.appupdater.AppUpdater;
 import com.github.javiersantos.appupdater.enums.Display;

app/src/main/res/layout/activity_main.xml

@@ -2,21 +2,21 @@
 <layout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools">
-    <android.support.design.widget.CoordinatorLayout
+    <androidx.coordinatorlayout.widget.CoordinatorLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:fitsSystemWindows="true"
         tools:context="com.github.javiersantos.appupdater.demo.MainActivity"
         tools:ignore="PrivateResource">
 
-        <android.support.design.widget.AppBarLayout
+        <com.google.android.material.appbar.AppBarLayout
             android:id="@+id/app_bar"
             android:layout_width="match_parent"
             android:layout_height="@dimen/app_bar_height"
             android:fitsSystemWindows="true"
             android:theme="@style/AppTheme.AppBarOverlay">
 
-            <android.support.design.widget.CollapsingToolbarLayout
+            <com.google.android.material.appbar.CollapsingToolbarLayout
                 android:id="@+id/toolbar_layout"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
@@ -51,20 +51,20 @@
                     android:textSize="@dimen/abc_text_size_subhead_material"
                     app:layout_collapseMode="parallax" />
 
-                <android.support.v7.widget.Toolbar
+                <androidx.appcompat.widget.Toolbar
                     android:id="@+id/toolbar"
                     android:layout_width="match_parent"
                     android:layout_height="?attr/actionBarSize"
                     app:layout_collapseMode="pin"
                     app:popupTheme="@style/AppTheme.PopupOverlay" />
 
-            </android.support.design.widget.CollapsingToolbarLayout>
-        </android.support.design.widget.AppBarLayout>
+            </com.google.android.material.appbar.CollapsingToolbarLayout>
+        </com.google.android.material.appbar.AppBarLayout>
 
         <include layout="@layout/content_main"
             android:id="@+id/included"/>
 
-        <android.support.design.widget.FloatingActionButton
+        <com.google.android.material.floatingactionbutton.FloatingActionButton
             android:id="@+id/fab"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -73,5 +73,5 @@
             app:layout_anchor="@id/app_bar"
             app:layout_anchorGravity="bottom|end" />
 
-    </android.support.design.widget.CoordinatorLayout>
+    </androidx.coordinatorlayout.widget.CoordinatorLayout>
 </layout>