Add GalleryCommentList to hold hasMore

app/src/main/java/com/hippo/ehviewer/client/EhEngine.java

@@ -24,7 +24,7 @@ import com.hippo.ehviewer.AppConfig;
 import com.hippo.ehviewer.GetText;
 import com.hippo.ehviewer.R;
 import com.hippo.ehviewer.Settings;
-import com.hippo.ehviewer.client.data.GalleryComment;
+import com.hippo.ehviewer.client.data.GalleryCommentList;
 import com.hippo.ehviewer.client.data.GalleryDetail;
 import com.hippo.ehviewer.client.data.GalleryInfo;
 import com.hippo.ehviewer.client.data.PreviewSet;
@@ -418,7 +418,7 @@ public class EhEngine {
         }
     }
 
-    public static GalleryComment[] commentGallery(@Nullable EhClient.Task task,
+    public static GalleryCommentList commentGallery(@Nullable EhClient.Task task,
             OkHttpClient okHttpClient, String url, String comment, String id) throws Throwable {
         FormBody.Builder builder = new FormBody.Builder();
         if (id == null) {

app/src/main/java/com/hippo/ehviewer/client/data/GalleryCommentList.java

@@ -0,0 +1,65 @@
+/*
+ * Copyright 2019 Hippo Seven
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.hippo.ehviewer.client.data;
+
+import android.os.Parcel;
+import android.os.Parcelable;
+import java.util.Arrays;
+
+public class GalleryCommentList implements Parcelable {
+
+  public GalleryComment[] comments;
+  public boolean hasMore;
+
+  @Override
+  public int describeContents() {
+    return 0;
+  }
+
+  @Override
+  public void writeToParcel(Parcel dest, int flags) {
+    dest.writeParcelableArray(comments, flags);
+    dest.writeByte(hasMore ? (byte) 1 : (byte) 0);
+  }
+
+  public GalleryCommentList(GalleryComment[] comments, boolean hasMore) {
+    this.comments = comments;
+    this.hasMore = hasMore;
+  }
+
+  protected GalleryCommentList(Parcel in) {
+    Parcelable[] array = in.readParcelableArray(getClass().getClassLoader());
+    if (array != null) {
+      comments = Arrays.copyOf(array, array.length, GalleryComment[].class);
+    } else {
+      comments = null;
+    }
+    hasMore = in.readByte() != 0;
+  }
+
+  public static final Creator<GalleryCommentList> CREATOR = new Creator<GalleryCommentList>() {
+    @Override
+    public GalleryCommentList createFromParcel(Parcel in) {
+      return new GalleryCommentList(in);
+    }
+
+    @Override
+    public GalleryCommentList[] newArray(int size) {
+      return new GalleryCommentList[size];
+    }
+  };
+}

app/src/main/java/com/hippo/ehviewer/client/data/GalleryDetail.java

@@ -37,7 +37,7 @@ public class GalleryDetail extends GalleryInfo {
     public boolean isFavorited;
     public int ratingCount;
     public GalleryTagGroup[] tags;
-    public GalleryComment[] comments;
+    public GalleryCommentList comments;
     public int previewPages;
     public PreviewSet previewSet;
 
@@ -60,8 +60,8 @@ public class GalleryDetail extends GalleryInfo {
         dest.writeInt(this.favoriteCount);
         dest.writeByte(isFavorited ? (byte) 1 : (byte) 0);
         dest.writeInt(this.ratingCount);
-        dest.writeParcelableArray(this.tags, 0);
-        dest.writeParcelableArray(this.comments, 0);
+        dest.writeParcelableArray(this.tags, flags);
+        dest.writeParcelable(this.comments, flags);
         dest.writeInt(this.previewPages);
         dest.writeParcelable(previewSet, flags);
     }
@@ -88,12 +88,7 @@ public class GalleryDetail extends GalleryInfo {
         } else {
             this.tags = null;
         }
-        array = in.readParcelableArray(GalleryComment.class.getClassLoader());
-        if (array != null) {
-            this.comments = Arrays.copyOf(array, array.length, GalleryComment[].class);
-        } else {
-            this.comments = null;
-        }
+        this.comments = in.readParcelable(getClass().getClassLoader());
         this.previewPages = in.readInt();
         this.previewSet = in.readParcelable(PreviewSet.class.getClassLoader());
     }

app/src/main/java/com/hippo/ehviewer/client/parser/GalleryDetailParser.java

@@ -22,6 +22,7 @@ import com.hippo.ehviewer.Settings;
 import com.hippo.ehviewer.client.EhUrl;
 import com.hippo.ehviewer.client.EhUtils;
 import com.hippo.ehviewer.client.data.GalleryComment;
+import com.hippo.ehviewer.client.data.GalleryCommentList;
 import com.hippo.ehviewer.client.data.GalleryDetail;
 import com.hippo.ehviewer.client.data.GalleryTagGroup;
 import com.hippo.ehviewer.client.data.LargePreviewSet;
@@ -33,6 +34,7 @@ import com.hippo.ehviewer.client.exception.ParseException;
 import com.hippo.ehviewer.client.exception.PiningException;
 import com.hippo.util.ExceptionUtils;
 import com.hippo.util.JsoupUtils;
+import com.hippo.util.MutableBoolean;
 import com.hippo.yorozuya.NumberUtils;
 import com.hippo.yorozuya.StringUtils;
 import java.text.DateFormat;
@@ -48,7 +50,10 @@ import java.util.regex.Pattern;
 import org.jsoup.Jsoup;
 import org.jsoup.nodes.Document;
 import org.jsoup.nodes.Element;
+import org.jsoup.nodes.Node;
 import org.jsoup.select.Elements;
+import org.jsoup.select.NodeTraversor;
+import org.jsoup.select.NodeVisitor;
 
 public class GalleryDetailParser {
 
@@ -66,7 +71,7 @@ public class GalleryDetailParser {
     private static final Pattern PATTERN_LARGE_PREVIEW = Pattern.compile("<div class=\"gdtl\".+?<a href=\"(.+?)\"><img alt=\"([\\d,]+)\".+?src=\"(.+?)\"");
 
     private static final GalleryTagGroup[] EMPTY_GALLERY_TAG_GROUP_ARRAY = new GalleryTagGroup[0];
-    private static final GalleryComment[] EMPTY_GALLERY_COMMENT_ARRAY = new GalleryComment[0];
+    private static final GalleryCommentList EMPTY_GALLERY_COMMENT_ARRAY = new GalleryCommentList(new GalleryComment[0], false);
 
     private static final DateFormat WEB_COMMENT_DATE_FORMAT = new SimpleDateFormat("dd MMMMM yyyy, HH:mm z", Locale.US);
 
@@ -451,7 +456,7 @@ public class GalleryDetailParser {
      * Parse comments with html parser
      */
     @NonNull
-    public static GalleryComment[] parseComments(Document document) {
+    public static GalleryCommentList parseComments(Document document) {
         try {
             Element cdiv = document.getElementById("cdiv");
             Elements c1s = cdiv.getElementsByClass("c1");
@@ -463,7 +468,22 @@ public class GalleryDetailParser {
                     list.add(comment);
                 }
             }
-            return list.toArray(new GalleryComment[list.size()]);
+
+            Element chd = cdiv.getElementById("chd");
+            MutableBoolean hasMore = new MutableBoolean(false);
+            NodeTraversor.traverse(new NodeVisitor() {
+                @Override
+                public void head(Node node, int depth) {
+                    if (node instanceof Element && ((Element) node).text().equals("click to show all")) {
+                        hasMore.value = true;
+                    }
+                }
+
+                @Override
+                public void tail(Node node, int depth) { }
+            }, chd);
+
+            return new GalleryCommentList(list.toArray(new GalleryComment[list.size()]), hasMore.value);
         } catch (Throwable e) {
             ExceptionUtils.throwIfFatal(e);
             e.printStackTrace();

app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryDetailScene.java

@@ -852,7 +852,7 @@ public class GalleryDetailScene extends BaseScene implements View.OnClickListene
         mTorrent.setText(resources.getString(R.string.torrent_count, gd.torrentCount));
 
         bindTags(gd.tags);
-        bindComments(gd.comments);
+        bindComments(gd.comments.comments);
         bindPreviews(gd);
     }
 
@@ -1279,7 +1279,7 @@ public class GalleryDetailScene extends BaseScene implements View.OnClickListene
             args.putString(GalleryCommentsScene.KEY_API_KEY, mGalleryDetail.apiKey);
             args.putLong(GalleryCommentsScene.KEY_GID, mGalleryDetail.gid);
             args.putString(GalleryCommentsScene.KEY_TOKEN, mGalleryDetail.token);
-            args.putParcelableArray(GalleryCommentsScene.KEY_COMMENTS, mGalleryDetail.comments);
+            args.putParcelableArray(GalleryCommentsScene.KEY_COMMENTS, mGalleryDetail.comments.comments);
             startScene(new Announcer(GalleryCommentsScene.class)
                     .setArgs(args)
                     .setRequestCode(this, REQUEST_CODE_COMMENT_GALLERY));
@@ -1443,7 +1443,7 @@ public class GalleryDetailScene extends BaseScene implements View.OnClickListene
                 if (mGalleryDetail == null) {
                     break;
                 }
-                mGalleryDetail.comments = comments;
+                mGalleryDetail.comments.comments = comments;
                 bindComments(comments);
                 break;
             default:

app/src/main/java/com/hippo/util/MutableBoolean.java

@@ -0,0 +1,26 @@
+/*
+ * Copyright 2019 Hippo Seven
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.hippo.util;
+
+public class MutableBoolean {
+
+  public boolean value;
+
+  public MutableBoolean(boolean value) {
+    this.value = value;
+  }
+}