Use custom html parser

seven332 · Oct 15, 2015 · b3ba2c2 · b3ba2c2
1 parent 8656139
commit b3ba2c2
Show file tree

Hide file tree

Showing 13 changed files with 1,068 additions and 9 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -66,6 +66,7 @@ dependencies {
     compile 'com.android.support:recyclerview-v7:23.0.1'
     compile 'com.alibaba:fastjson:1.1.45.android'
     compile 'com.squareup.okhttp:okhttp:2.5.0'
+    compile 'org.ccil.cowan.tagsoup:tagsoup:1.2.1'
     compile 'org.jsoup:jsoup:1.8.3'
     debugCompile 'com.squareup.leakcanary:leakcanary-android:1.3.1'
     releaseCompile 'com.squareup.leakcanary:leakcanary-android-no-op:1.3.1'

diff --git a/app/src/main/java/com/hippo/nimingban/client/UpdateHelper.java b/app/src/main/java/com/hippo/nimingban/client/UpdateHelper.java
@@ -26,7 +26,6 @@
 import android.os.AsyncTask;
 import android.support.v7.app.AlertDialog;
 import android.support.v7.app.NotificationCompat;
-import android.text.Html;
 import android.widget.Toast;
 
 import com.hippo.network.DownloadClient;
@@ -37,6 +36,7 @@
 import com.hippo.nimingban.client.data.DiscUrl;
 import com.hippo.nimingban.client.data.UpdateStatus;
 import com.hippo.nimingban.util.Settings;
+import com.hippo.text.Html;
 import com.hippo.unifile.UniFile;
 import com.hippo.util.TextUtils2;
 import com.hippo.util.Timer;

diff --git a/app/src/main/java/com/hippo/nimingban/client/ac/data/ACFeed.java b/app/src/main/java/com/hippo/nimingban/client/ac/data/ACFeed.java
@@ -18,7 +18,6 @@
 
 import android.graphics.Color;
 import android.os.Parcel;
-import android.text.Html;
 import android.text.Spannable;
 import android.text.SpannableString;
 import android.text.Spanned;
@@ -29,6 +28,7 @@
 import com.hippo.nimingban.client.data.Post;
 import com.hippo.nimingban.client.data.Reply;
 import com.hippo.nimingban.client.data.Site;
+import com.hippo.text.Html;
 
 public class ACFeed extends Post {
 

diff --git a/app/src/main/java/com/hippo/nimingban/client/ac/data/ACPost.java b/app/src/main/java/com/hippo/nimingban/client/ac/data/ACPost.java
@@ -19,7 +19,6 @@
 import android.graphics.Color;
 import android.graphics.Typeface;
 import android.os.Parcel;
-import android.text.Html;
 import android.text.Spannable;
 import android.text.SpannableString;
 import android.text.SpannableStringBuilder;
@@ -35,6 +34,7 @@
 import com.hippo.nimingban.client.data.Post;
 import com.hippo.nimingban.client.data.Reply;
 import com.hippo.nimingban.client.data.Site;
+import com.hippo.text.Html;
 import com.hippo.yorozuya.NumberUtils;
 
 import java.text.ParseException;

diff --git a/app/src/main/java/com/hippo/nimingban/client/ac/data/ACReference.java b/app/src/main/java/com/hippo/nimingban/client/ac/data/ACReference.java
@@ -18,7 +18,6 @@
 
 import android.graphics.Color;
 import android.os.Parcel;
-import android.text.Html;
 import android.text.Spannable;
 import android.text.SpannableString;
 import android.text.Spanned;
@@ -28,6 +27,7 @@
 import com.hippo.nimingban.client.ac.ACUrl;
 import com.hippo.nimingban.client.data.Reply;
 import com.hippo.nimingban.client.data.Site;
+import com.hippo.text.Html;
 
 public class ACReference extends Reply {
 

diff --git a/app/src/main/java/com/hippo/nimingban/client/ac/data/ACReply.java b/app/src/main/java/com/hippo/nimingban/client/ac/data/ACReply.java
@@ -18,7 +18,6 @@
 
 import android.graphics.Color;
 import android.os.Parcel;
-import android.text.Html;
 import android.text.Spannable;
 import android.text.SpannableString;
 import android.text.Spanned;
@@ -28,6 +27,7 @@
 import com.hippo.nimingban.client.ac.ACUrl;
 import com.hippo.nimingban.client.data.Reply;
 import com.hippo.nimingban.client.data.Site;
+import com.hippo.text.Html;
 
 public class ACReply extends Reply {
 

diff --git a/app/src/main/java/com/hippo/nimingban/client/ac/data/ACSearchItem.java b/app/src/main/java/com/hippo/nimingban/client/ac/data/ACSearchItem.java
@@ -17,12 +17,12 @@
 package com.hippo.nimingban.client.ac.data;
 
 import android.os.Parcel;
-import android.text.Html;
 import android.text.TextUtils;
 
 import com.hippo.nimingban.client.ac.ACUrl;
 import com.hippo.nimingban.client.data.Reply;
 import com.hippo.nimingban.client.data.Site;
+import com.hippo.text.Html;
 
 public class ACSearchItem extends Reply {
 

diff --git a/app/src/main/java/com/hippo/nimingban/ui/ListActivity.java b/app/src/main/java/com/hippo/nimingban/ui/ListActivity.java
@@ -36,7 +36,6 @@
 import android.support.v7.widget.RecyclerView;
 import android.support.v7.widget.StaggeredGridLayoutManager;
 import android.support.v7.widget.Toolbar;
-import android.text.Html;
 import android.text.Spannable;
 import android.text.SpannableString;
 import android.text.Spanned;
@@ -87,6 +86,7 @@
 import com.hippo.nimingban.widget.LoadImageView;
 import com.hippo.nimingban.widget.RightDrawer;
 import com.hippo.rippleold.RippleSalon;
+import com.hippo.text.Html;
 import com.hippo.text.URLImageGetter;
 import com.hippo.unifile.UniFile;
 import com.hippo.util.ActivityHelper;

diff --git a/app/src/main/java/com/hippo/nimingban/ui/SettingsActivity.java b/app/src/main/java/com/hippo/nimingban/ui/SettingsActivity.java
@@ -38,7 +38,6 @@
 import android.support.annotation.NonNull;
 import android.support.annotation.StringRes;
 import android.support.v7.app.AlertDialog;
-import android.text.Html;
 import android.text.TextUtils;
 import android.view.LayoutInflater;
 import android.view.MenuItem;
@@ -63,6 +62,7 @@
 import com.hippo.nimingban.util.ReadableTime;
 import com.hippo.nimingban.util.Settings;
 import com.hippo.preference.FixedSwitchPreference;
+import com.hippo.text.Html;
 import com.hippo.unifile.UniFile;
 import com.hippo.util.ActivityHelper;
 import com.hippo.widget.Slider;