Add normal preview support

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

@@ -37,8 +37,7 @@ public class GalleryDetail extends GalleryInfo {
     public GalleryTagGroup[] tags;
     public GalleryComment[] comments;
     public int previewPages;
-    public LargePreviewSet previewSet;
-
+    public PreviewSet previewSet;
 
     @Override
     public int describeContents() {
@@ -94,7 +93,7 @@ public class GalleryDetail extends GalleryInfo {
             this.comments = null;
         }
         this.previewPages = in.readInt();
-        this.previewSet = in.readParcelable(LargePreviewSet.class.getClassLoader());
+        this.previewSet = in.readParcelable(PreviewSet.class.getClassLoader());
     }
 
     public static final Creator<GalleryDetail> CREATOR = new Creator<GalleryDetail>() {

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

@@ -19,11 +19,27 @@ package com.hippo.ehviewer.client.data;
 import android.os.Parcel;
 import android.os.Parcelable;
 
+import com.hippo.widget.LoadImageView;
+
 public class GalleryPreview implements Parcelable {
 
-    public String imageUrl;
-    public String pageUrl;
-    public int index;
+    String imageKey;
+    String imageUrl;
+    String pageUrl;
+    int position;
+    int offsetX = Integer.MIN_VALUE;
+    int offsetY = Integer.MIN_VALUE;
+    int clipWidth = Integer.MIN_VALUE;
+    int clipHeight = Integer.MIN_VALUE;
+
+    public int getPosition() {
+        return position;
+    }
+
+    public void load(LoadImageView view) {
+        view.setClip(offsetX, offsetY, clipWidth, clipHeight);
+        view.load(imageKey, imageUrl);
+    }
 
     @Override
     public int describeContents() {
@@ -34,7 +50,11 @@ public class GalleryPreview implements Parcelable {
     public void writeToParcel(Parcel dest, int flags) {
         dest.writeString(this.imageUrl);
         dest.writeString(this.pageUrl);
-        dest.writeInt(this.index);
+        dest.writeInt(this.position);
+        dest.writeInt(this.offsetX);
+        dest.writeInt(this.offsetY);
+        dest.writeInt(this.clipWidth);
+        dest.writeInt(this.clipHeight);
     }
 
     public GalleryPreview() {
@@ -43,14 +63,20 @@ public class GalleryPreview implements Parcelable {
     protected GalleryPreview(Parcel in) {
         this.imageUrl = in.readString();
         this.pageUrl = in.readString();
-        this.index = in.readInt();
+        this.position = in.readInt();
+        this.offsetX = in.readInt();
+        this.offsetY = in.readInt();
+        this.clipWidth = in.readInt();
+        this.clipHeight = in.readInt();
     }
 
     public static final Parcelable.Creator<GalleryPreview> CREATOR = new Parcelable.Creator<GalleryPreview>() {
+        @Override
         public GalleryPreview createFromParcel(Parcel source) {
             return new GalleryPreview(source);
         }
 
+        @Override
         public GalleryPreview[] newArray(int size) {
             return new GalleryPreview[size];
         }

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

@@ -19,38 +19,56 @@ package com.hippo.ehviewer.client.data;
 import android.os.Parcel;
 import android.os.Parcelable;
 
+import com.hippo.ehviewer.client.EhCacheKeyFactory;
+import com.hippo.widget.LoadImageView;
 import com.hippo.yorozuya.IntList;
 
 import java.util.ArrayList;
 
-public class LargePreviewSet implements Parcelable {
+public class LargePreviewSet extends PreviewSet {
 
-    private final IntList mIndexList;
+    private final IntList mPositionList;
     private final ArrayList<String> mImageUrlList;
     private final ArrayList<String> mPageUrlList;
 
-    public int size() {
-        return mImageUrlList.size();
-    }
-
     public void addItem(int index, String imageUrl, String pageUrl) {
-        mIndexList.add(index);
+        mPositionList.add(index);
         mImageUrlList.add(imageUrl);
         mPageUrlList.add(pageUrl);
     }
 
-    public int getIndexAt(int index) {
-        return mIndexList.get(index);
+    @Override
+    public int size() {
+        return mImageUrlList.size();
     }
 
-    public String getImageUrlAt(int index) {
-        return mImageUrlList.get(index);
+    @Override
+    public int getPosition(int index) {
+        return mPositionList.get(index);
     }
 
+    @Override
     public String getPageUrlAt(int index) {
         return mPageUrlList.get(index);
     }
 
+    @Override
+    public GalleryPreview getGalleryPreview(long gid, int index) {
+        GalleryPreview galleryPreview = new GalleryPreview();
+        galleryPreview.position = mPositionList.get(index);
+        galleryPreview.imageKey = EhCacheKeyFactory.getLargePreviewKey(gid, galleryPreview.position);
+        galleryPreview.imageUrl = mImageUrlList.get(index);
+        galleryPreview.pageUrl = mPageUrlList.get(index);
+        return galleryPreview;
+    }
+
+    @Override
+    public void load(LoadImageView view, long gid, int index) {
+        view.resetClip();
+        view.load(EhCacheKeyFactory.getLargePreviewKey(gid, mPositionList.get(index)),
+                mImageUrlList.get(index));
+    }
+
     @Override
     public int describeContents() {
         return 0;
@@ -58,19 +76,19 @@ public class LargePreviewSet implements Parcelable {
 
     @Override
     public void writeToParcel(Parcel dest, int flags) {
-        dest.writeParcelable(this.mIndexList, flags);
+        dest.writeParcelable(this.mPositionList, flags);
         dest.writeStringList(this.mImageUrlList);
         dest.writeStringList(this.mPageUrlList);
     }
 
     public LargePreviewSet() {
-        mIndexList = new IntList();
+        mPositionList = new IntList();
         mImageUrlList = new ArrayList<>();
         mPageUrlList = new ArrayList<>();
     }
 
     protected LargePreviewSet(Parcel in) {
-        this.mIndexList = in.readParcelable(IntList.class.getClassLoader());
+        this.mPositionList = in.readParcelable(IntList.class.getClassLoader());
         this.mImageUrlList = in.createStringArrayList();
         this.mPageUrlList = in.createStringArrayList();
     }

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

@@ -16,40 +16,121 @@
 
 package com.hippo.ehviewer.client.data;
 
+import android.os.Parcel;
+
+import com.hippo.widget.LoadImageView;
 import com.hippo.yorozuya.IntList;
 
 import java.util.ArrayList;
 
-public class NormalPreviewSet {
+public class NormalPreviewSet extends PreviewSet {
 
-    private final IntList mIndexList = new IntList();
-    private final ArrayList<String> mImageUrlList = new ArrayList<>();
-    private final IntList mXOffsetList = new IntList();
-    private final IntList mYOffsetList = new IntList();
-    private final IntList mWidthList = new IntList();
-    private final IntList mHeightList = new IntList();
-    private final ArrayList<String> mPageUrlList = new ArrayList<>();
+    private IntList mPositionList = new IntList();
+    private ArrayList<String> mImageKeyList = new ArrayList<>();
+    private ArrayList<String> mImageUrlList = new ArrayList<>();
+    private IntList mOffsetXList = new IntList();
+    private IntList mOffsetYList = new IntList();
+    private IntList mClipWidthList = new IntList();
+    private IntList mClipHeightList = new IntList();
+    private ArrayList<String> mPageUrlList = new ArrayList<>();
 
-    public void addItem(int index, String imageUrl, int xOffset, int yOffset, int width,
+    private String getImageKey(String imageUrl) {
+        int index = imageUrl.indexOf('/');
+        if (index >= 0) {
+            return imageUrl.substring(index + 1);
+        } else {
+            return imageUrl;
+        }
+    }
+
+    public void addItem(int position, String imageUrl, int xOffset, int yOffset, int width,
             int height, String pageUrl) {
-        mIndexList.add(index);
+        mPositionList.add(position);
+        mImageKeyList.add(getImageKey(imageUrl));
         mImageUrlList.add(imageUrl);
-        mXOffsetList.add(xOffset);
-        mYOffsetList.add(yOffset);
-        mWidthList.add(width);
-        mHeightList.add(height);
+        mOffsetXList.add(xOffset);
+        mOffsetYList.add(yOffset);
+        mClipWidthList.add(width);
+        mClipHeightList.add(height);
         mPageUrlList.add(pageUrl);
     }
 
+    @Override
     public int size() {
-        return mIndexList.size();
+        return mPositionList.size();
     }
 
-    public int getIndexAt(int index) {
-        return mIndexList.get(index);
+    @Override
+    public int getPosition(int index) {
+        return mPositionList.get(index);
     }
 
+    @Override
     public String getPageUrlAt(int index) {
         return mPageUrlList.get(index);
     }
+
+    @Override
+    public GalleryPreview getGalleryPreview(long gid, int index) {
+        GalleryPreview galleryPreview = new GalleryPreview();
+        galleryPreview.position = mPositionList.get(index);
+        galleryPreview.imageKey = mImageKeyList.get(index);
+        galleryPreview.imageUrl = mImageUrlList.get(index);
+        galleryPreview.pageUrl = mPageUrlList.get(index);
+        galleryPreview.offsetX = mOffsetXList.get(index);
+        galleryPreview.offsetY = mOffsetYList.get(index);
+        galleryPreview.clipWidth = mClipWidthList.get(index);
+        galleryPreview.clipHeight = mClipHeightList.get(index);
+        return galleryPreview;
+    }
+
+    @Override
+    public void load(LoadImageView view, long gid, int index) {
+        view.setClip(mOffsetXList.get(index), mOffsetYList.get(index),
+                mClipWidthList.get(index), mClipHeightList.get(index));
+        view.load(mImageKeyList.get(index), mImageUrlList.get(index));
+    }
+
+    @Override
+    public int describeContents() {
+        return 0;
+    }
+
+    @Override
+    public void writeToParcel(Parcel dest, int flags) {
+        dest.writeParcelable(this.mPositionList, flags);
+        dest.writeStringList(this.mImageKeyList);
+        dest.writeStringList(this.mImageUrlList);
+        dest.writeParcelable(this.mOffsetXList, flags);
+        dest.writeParcelable(this.mOffsetYList, flags);
+        dest.writeParcelable(this.mClipWidthList, flags);
+        dest.writeParcelable(this.mClipHeightList, flags);
+        dest.writeStringList(this.mPageUrlList);
+    }
+
+    public NormalPreviewSet() {
+    }
+
+    protected NormalPreviewSet(Parcel in) {
+        this.mPositionList = in.readParcelable(IntList.class.getClassLoader());
+        this.mImageKeyList = in.createStringArrayList();
+        this.mImageUrlList = in.createStringArrayList();
+        this.mOffsetXList = in.readParcelable(IntList.class.getClassLoader());
+        this.mOffsetYList = in.readParcelable(IntList.class.getClassLoader());
+        this.mClipWidthList = in.readParcelable(IntList.class.getClassLoader());
+        this.mClipHeightList = in.readParcelable(IntList.class.getClassLoader());
+        this.mPageUrlList = in.createStringArrayList();
+    }
+
+    public static final Creator<NormalPreviewSet> CREATOR = new Creator<NormalPreviewSet>() {
+        @Override
+        public NormalPreviewSet createFromParcel(Parcel source) {
+            return new NormalPreviewSet(source);
+        }
+
+        @Override
+        public NormalPreviewSet[] newArray(int size) {
+            return new NormalPreviewSet[size];
+        }
+    };
 }

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

@@ -0,0 +1,34 @@
+/*
+ * Copyright 2016 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.Parcelable;
+
+import com.hippo.widget.LoadImageView;
+
+public abstract class PreviewSet implements Parcelable {
+
+    public abstract int size();
+
+    public abstract int getPosition(int index);
+
+    public abstract String getPageUrlAt(int index);
+
+    public abstract GalleryPreview getGalleryPreview(long gid, int index);
+
+    public abstract void load(LoadImageView view, long gid, int index);
+}