It is best to call this only when over-scroll isn't currently in-effect - i.e. verify that
- * getCurrentState()==IOverScrollState.STATE_IDLE as a precondition, or otherwise
- * use a state listener previously installed using
- * {@link #setOverScrollStateListener(IOverScrollStateListener)}.
- *
- * Note: Upon detachment completion, the view in question will return to the default
- * Android over-scroll configuration (i.e. {@link View.OVER_SCROLL_ALWAYS} mode). This can be
- * overridden by calling View.setOverScrollMode(mode) immediately thereafter.
- */
- void detach();
-}
\ No newline at end of file
diff --git a/app/src/main/java/org/nv95/openmanga/components/reader/recyclerpager/overscroll/IOverScrollDecoratorAdapter.java b/app/src/main/java/org/nv95/openmanga/components/reader/recyclerpager/overscroll/IOverScrollDecoratorAdapter.java
deleted file mode 100644
index fbfe92d6..00000000
--- a/app/src/main/java/org/nv95/openmanga/components/reader/recyclerpager/overscroll/IOverScrollDecoratorAdapter.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package org.nv95.openmanga.components.reader.recyclerpager.overscroll;
-
-import android.view.View;
-
-/**
- * @author amitd
- *
- * @see HorizontalOverScrollBounceEffectDecorator
- */
-public interface IOverScrollDecoratorAdapter {
-
- View getView();
-
- /**
- * Is view in it's absolute start position - such that a negative over-scroll can potentially
- * be initiated. For example, in list-views, this is synonymous with the first item being
- * fully visible.
- *
- * @return Whether in absolute start position.
- */
- boolean isInAbsoluteStart();
-
- /**
- * Is view in it's absolute end position - such that an over-scroll can potentially
- * be initiated. For example, in list-views, this is synonymous with the last item being
- * fully visible.
- *
- * @return Whether in absolute end position.
- */
- boolean isInAbsoluteEnd();
-}
\ No newline at end of file
diff --git a/app/src/main/java/org/nv95/openmanga/components/reader/recyclerpager/overscroll/IOverScrollState.java b/app/src/main/java/org/nv95/openmanga/components/reader/recyclerpager/overscroll/IOverScrollState.java
deleted file mode 100644
index f9799f15..00000000
--- a/app/src/main/java/org/nv95/openmanga/components/reader/recyclerpager/overscroll/IOverScrollState.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package org.nv95.openmanga.components.reader.recyclerpager.overscroll;
-
-/**
- * @author amit
- */
-public interface IOverScrollState {
-
- /** No over-scroll is in-effect. */
- int STATE_IDLE = 0;
-
- /** User is actively touch-dragging, thus enabling over-scroll at the view's Design-wise, being a standalone class, this decorator powerfully provides the ability to add
- * the over-scroll effect over any view without adjusting the view's implementation. In essence, this
- * eliminates the need to repeatedly implement the effect per each view type (list-view,
- * recycler-view, image-view, etc.). Therefore, using it is highly recommended compared to other
- * more intrusive solutions.
- * Note that this class is abstract, having {@link HorizontalOverScrollBounceEffectDecorator} and
- * {@link VerticalOverScrollBounceEffectDecorator} providing concrete implementations that are
- * view-orientation specific.
- * At it's core, the class simply registers itself as a touch-listener over the decorated view and
- * intercepts touch events as needed.
- * Internally, it delegates the over-scrolling calculations onto 3 state-based classes:
- *
mProperty;
- public float mAbsOffset;
- public float mMaxOffset;
-
- protected abstract void init(View view);
- }
-
- /**
- * Interface of decorator-state delegation classes. Defines states as handles of two fundamental
- * touch events: actual movement, up/cancel.
- */
- protected interface IDecoratorState {
-
- /**
- * Handle a motion (touch) event.
- *
- * @param event The event from onTouch.
- * @return Return value for onTouch.
- */
- boolean handleMoveTouchEvent(MotionEvent event);
-
- /**
- * Handle up / touch-cancel events.
- *
- * @param event The event from onTouch.
- * @return Return value for onTouch.
- */
- boolean handleUpOrCancelTouchEvent(MotionEvent event);
-
- /**
- * Handle a transition onto this state, as it becomes 'current' state.
- *
- * @param fromState
- */
- void handleEntryTransition(IDecoratorState fromState);
-
- /**
- * The client-perspective ID of the state associated with this (internal) one. ID's
- * are as specified in {@link IOverScrollState}.
- *
- * @return The ID, e.g. {@link IOverScrollState#STATE_IDLE}.
- */
- int getStateId();
- }
-
- /**
- * Idle state: monitors move events, trying to figure out whether over-scrolling should be
- * initiated (i.e. when scrolled further when the view is at one of its displayable ends).
- *
When such is the case, it hands over control to the over-scrolling state.
- */
- protected class IdleState implements IDecoratorState {
-
- final MotionAttributes mMoveAttr;
-
- public IdleState() {
- mMoveAttr = createMotionAttributes();
- }
-
- @Override
- public int getStateId() {
- return STATE_IDLE;
- }
-
- @Override
- public boolean handleMoveTouchEvent(MotionEvent event) {
-
- final View view = mViewAdapter.getView();
- if (!mMoveAttr.init(view, event)) {
- return false;
- }
-
- // Has over-scrolling officially started?
- if ((mViewAdapter.isInAbsoluteStart() && mMoveAttr.mDir) ||
- (mViewAdapter.isInAbsoluteEnd() && !mMoveAttr.mDir)) {
-
- // Save initial over-scroll attributes for future reference.
- mStartAttr.mPointerId = event.getPointerId(0);
- mStartAttr.mAbsOffset = mMoveAttr.mAbsOffset;
- mStartAttr.mDir = mMoveAttr.mDir;
-
- issueStateTransition(mOverScrollingState);
- return mOverScrollingState.handleMoveTouchEvent(event);
- }
-
- return false;
- }
-
- @Override
- public boolean handleUpOrCancelTouchEvent(MotionEvent event) {
- return false;
- }
-
- @Override
- public void handleEntryTransition(IDecoratorState fromState) {
- mStateListener.onOverScrollStateChange(OverScrollBounceEffectDecoratorBase.this, fromState.getStateId(), this.getStateId());
- }
- }
-
- /**
- * Handles the actual over-scrolling: thus translating the view according to configuration
- * and user interactions, dynamically.
- *
- *
The state is exited - thus completing over-scroll handling, in one of two cases:
- *
When user lets go of the view, it transitions control to the bounce-back state.
- *
When user moves the view back onto a potential 'under-scroll' state, it abruptly
- * transitions control to the idle-state, so as to return touch-events management to the
- * normal over-scroll-less environment (thus preventing under-scrolling and potentially regaining
- * regular scrolling).
- */
- protected class OverScrollingState implements IDecoratorState {
-
- protected final float mTouchDragRatioFwd;
- protected final float mTouchDragRatioBck;
-
- final MotionAttributes mMoveAttr;
- int mCurrDragState;
-
- public OverScrollingState(float touchDragRatioFwd, float touchDragRatioBck) {
- mMoveAttr = createMotionAttributes();
- mTouchDragRatioFwd = touchDragRatioFwd;
- mTouchDragRatioBck = touchDragRatioBck;
- }
-
- @Override
- public int getStateId() {
- // This is really a single class that implements 2 states, so our ID depends on what
- // it was during the last invocation.
- return mCurrDragState;
- }
-
- @Override
- public boolean handleMoveTouchEvent(MotionEvent event) {
-
- // Switching 'pointers' (e.g. fingers) on-the-fly isn't supported -- abort over-scroll
- // smoothly using the default bounce-back animation in this case.
- if (mStartAttr.mPointerId != event.getPointerId(0)) {
- issueStateTransition(mBounceBackState);
- return true;
- }
-
- final View view = mViewAdapter.getView();
- if (!mMoveAttr.init(view, event)) {
- // Keep intercepting the touch event as long as we're still over-scrolling...
- return true;
- }
-
- float deltaOffset = mMoveAttr.mDeltaOffset / (mMoveAttr.mDir == mStartAttr.mDir ? mTouchDragRatioFwd : mTouchDragRatioBck);
- float newOffset = mMoveAttr.mAbsOffset + deltaOffset;
-
- // If moved in counter direction onto a potential under-scroll state -- don't. Instead, abort
- // over-scrolling abruptly, thus returning control to which-ever touch handlers there
- // are waiting (e.g. regular scroller handlers).
- if ((mStartAttr.mDir && !mMoveAttr.mDir && (newOffset <= mStartAttr.mAbsOffset)) ||
- (!mStartAttr.mDir && mMoveAttr.mDir && (newOffset >= mStartAttr.mAbsOffset))) {
- translateViewAndEvent(view, mStartAttr.mAbsOffset, event);
- mUpdateListener.onOverScrollUpdate(OverScrollBounceEffectDecoratorBase.this, mCurrDragState, 0);
-
- issueStateTransition(mIdleState);
- return true;
- }
-
- if (view.getParent() != null) {
- view.getParent().requestDisallowInterceptTouchEvent(true);
- }
-
- long dt = event.getEventTime() - event.getHistoricalEventTime(0);
- if (dt > 0) { // Sometimes (though rarely) dt==0 cause originally timing is in nanos, but is presented in millis.
- mVelocity = deltaOffset / dt;
- }
-
- translateView(view, newOffset);
- mUpdateListener.onOverScrollUpdate(OverScrollBounceEffectDecoratorBase.this, mCurrDragState, newOffset);
-
- return true;
- }
-
- @Override
- public boolean handleUpOrCancelTouchEvent(MotionEvent event) {
- issueStateTransition(mBounceBackState);
- return false;
- }
-
- @Override
- public void handleEntryTransition(IDecoratorState fromState) {
- mCurrDragState = (mStartAttr.mDir ? STATE_DRAG_START_SIDE : STATE_DRAG_END_SIDE);
- mStateListener.onOverScrollStateChange(OverScrollBounceEffectDecoratorBase.this, fromState.getStateId(), this.getStateId());
- }
- }
-
- /**
- * When entered, starts the bounce-back animation.
- *
Upon animation completion, transitions control onto the idle state; Does so by
- * registering itself as an animation listener.
- *
In the meantime, blocks (intercepts) all touch events.
- */
- protected class BounceBackState implements IDecoratorState, Animator.AnimatorListener, ValueAnimator.AnimatorUpdateListener {
-
- protected final Interpolator mBounceBackInterpolator = new DecelerateInterpolator();
- protected final float mDecelerateFactor;
- protected final float mDoubleDecelerateFactor;
-
- protected final AnimationAttributes mAnimAttributes;
-
- public BounceBackState(float decelerateFactor) {
- mDecelerateFactor = decelerateFactor;
- mDoubleDecelerateFactor = 2f * decelerateFactor;
-
- mAnimAttributes = createAnimationAttributes();
- }
-
- @Override
- public int getStateId() {
- return STATE_BOUNCE_BACK;
- }
-
- @Override
- public void handleEntryTransition(IDecoratorState fromState) {
-
- mStateListener.onOverScrollStateChange(OverScrollBounceEffectDecoratorBase.this, fromState.getStateId(), this.getStateId());
-
- Animator bounceBackAnim = createAnimator();
- bounceBackAnim.addListener(this);
-
- bounceBackAnim.start();
- }
-
- @Override
- public boolean handleMoveTouchEvent(MotionEvent event) {
- // Flush all touches down the drain till animation is over.
- return true;
- }
-
- @Override
- public boolean handleUpOrCancelTouchEvent(MotionEvent event) {
- // Flush all touches down the drain till animation is over.
- return true;
- }
-
- @Override
- public void onAnimationEnd(Animator animation) {
- issueStateTransition(mIdleState);
- }
-
- @Override
- public void onAnimationUpdate(ValueAnimator animation) {
- mUpdateListener.onOverScrollUpdate(OverScrollBounceEffectDecoratorBase.this, STATE_BOUNCE_BACK, (Float) animation.getAnimatedValue());
- }
-
- @Override
- public void onAnimationStart(Animator animation) {
- }
-
- @Override
- public void onAnimationCancel(Animator animation) {
- }
-
- @Override
- public void onAnimationRepeat(Animator animation) {
- }
-
- protected Animator createAnimator() {
-
- final View view = mViewAdapter.getView();
-
- mAnimAttributes.init(view);
-
- // Set up a low-duration slow-down animation IN the drag direction.
-
- // Exception: If wasn't dragging in 'forward' direction (or velocity=0 -- i.e. not dragging at all),
- // skip slow-down anim directly to the bounce-back.
- if (mVelocity == 0f || (mVelocity < 0 && mStartAttr.mDir) || (mVelocity > 0 && !mStartAttr.mDir)) {
- return createBounceBackAnimator(mAnimAttributes.mAbsOffset);
- }
-
- // dt = (Vt - Vo) / a; Vt=0 ==> dt = -Vo / a
- float slowdownDuration = -mVelocity / mDecelerateFactor;
- slowdownDuration = (slowdownDuration < 0 ? 0 : slowdownDuration); // Happens in counter-direction dragging
-
- // dx = (Vt^2 - Vo^2) / 2a; Vt=0 ==> dx = -Vo^2 / 2a
- float slowdownDistance = -mVelocity * mVelocity / mDoubleDecelerateFactor;
- float slowdownEndOffset = mAnimAttributes.mAbsOffset + slowdownDistance;
-
- ObjectAnimator slowdownAnim = createSlowdownAnimator(view, (int) slowdownDuration, slowdownEndOffset);
-
- // Set up the bounce back animation, bringing the view back into the original, pre-overscroll position (translation=0).
-
- ObjectAnimator bounceBackAnim = createBounceBackAnimator(slowdownEndOffset);
-
- // Play the 2 animations as a sequence.
- AnimatorSet wholeAnim = new AnimatorSet();
- wholeAnim.playSequentially(slowdownAnim, bounceBackAnim);
- return wholeAnim;
- }
-
- protected ObjectAnimator createSlowdownAnimator(View view, int slowdownDuration, float slowdownEndOffset) {
- ObjectAnimator slowdownAnim = ObjectAnimator.ofFloat(view, mAnimAttributes.mProperty, slowdownEndOffset);
- slowdownAnim.setDuration(slowdownDuration);
- slowdownAnim.setInterpolator(mBounceBackInterpolator);
- slowdownAnim.addUpdateListener(this);
- return slowdownAnim;
- }
-
- protected ObjectAnimator createBounceBackAnimator(float startOffset) {
-
- final View view = mViewAdapter.getView();
-
- // Duration is proportional to the view's size.
- float bounceBackDuration = (Math.abs(startOffset) / mAnimAttributes.mMaxOffset) * MAX_BOUNCE_BACK_DURATION_MS;
- ObjectAnimator bounceBackAnim = ObjectAnimator.ofFloat(view, mAnimAttributes.mProperty, mStartAttr.mAbsOffset);
- bounceBackAnim.setDuration(Math.max((int) bounceBackDuration, MIN_BOUNCE_BACK_DURATION_MS));
- bounceBackAnim.setInterpolator(mBounceBackInterpolator);
- bounceBackAnim.addUpdateListener(this);
- return bounceBackAnim;
- }
- }
-
- public OverScrollBounceEffectDecoratorBase(IOverScrollDecoratorAdapter viewAdapter, float decelerateFactor, float touchDragRatioFwd, float touchDragRatioBck) {
- mViewAdapter = viewAdapter;
-
- mBounceBackState = new BounceBackState(decelerateFactor);
- mOverScrollingState = new OverScrollingState(touchDragRatioFwd, touchDragRatioBck);
- mIdleState = new IdleState();
-
- mCurrentState = mIdleState;
-
- attach();
- }
-
- @Override
- public boolean onTouch(View v, MotionEvent event) {
- switch (event.getAction()) {
- case MotionEvent.ACTION_MOVE:
- return mCurrentState.handleMoveTouchEvent(event);
-
- case MotionEvent.ACTION_CANCEL:
- case MotionEvent.ACTION_UP:
- return mCurrentState.handleUpOrCancelTouchEvent(event);
- }
-
- return false;
- }
-
- @Override
- public void setOverScrollStateListener(IOverScrollStateListener listener) {
- mStateListener = (listener != null ? listener : new ListenerStubs.OverScrollStateListenerStub());
- }
-
- @Override
- public void setOverScrollUpdateListener(IOverScrollUpdateListener listener) {
- mUpdateListener = (listener != null ? listener : new ListenerStubs.OverScrollUpdateListenerStub());
- }
-
- @Override
- public int getCurrentState() {
- return mCurrentState.getStateId();
- }
-
- @Override
- public View getView() {
- return mViewAdapter.getView();
- }
-
- protected void issueStateTransition(IDecoratorState state) {
- IDecoratorState oldState = mCurrentState;
- mCurrentState = state;
- mCurrentState.handleEntryTransition(oldState);
- }
-
- protected void attach() {
- getView().setOnTouchListener(this);
- getView().setOverScrollMode(View.OVER_SCROLL_NEVER);
- }
-
- @Override
- public void detach() {
- if (mCurrentState != mIdleState) {
- Log.w(TAG, "Decorator detached while over-scroll is in effect. You might want to add a precondition of that getCurrentState()==STATE_IDLE, first.");
- }
- getView().setOnTouchListener(null);
- getView().setOverScrollMode(View.OVER_SCROLL_ALWAYS);
- }
-
- protected abstract MotionAttributes createMotionAttributes();
-
- protected abstract AnimationAttributes createAnimationAttributes();
-
- protected abstract void translateView(View view, float offset);
-
- protected abstract void translateViewAndEvent(View view, float offset, MotionEvent event);
-}
\ No newline at end of file
diff --git a/app/src/main/java/org/nv95/openmanga/components/reader/recyclerpager/overscroll/RecyclerViewOverScrollDecorAdapter.java b/app/src/main/java/org/nv95/openmanga/components/reader/recyclerpager/overscroll/RecyclerViewOverScrollDecorAdapter.java
deleted file mode 100644
index 89e78e66..00000000
--- a/app/src/main/java/org/nv95/openmanga/components/reader/recyclerpager/overscroll/RecyclerViewOverScrollDecorAdapter.java
+++ /dev/null
@@ -1,223 +0,0 @@
-package org.nv95.openmanga.components.reader.recyclerpager.overscroll;
-
-import android.graphics.Canvas;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
-import android.support.v7.widget.StaggeredGridLayoutManager;
-import android.support.v7.widget.helper.ItemTouchHelper;
-import android.view.View;
-
-import java.util.List;
-
-
-/**
- * @author amitd
- * @see HorizontalOverScrollBounceEffectDecorator
- * @see VerticalOverScrollBounceEffectDecorator
- */
-public class RecyclerViewOverScrollDecorAdapter implements IOverScrollDecoratorAdapter {
-
- /**
- * A delegation of the adapter implementation of this view that should provide the processing
- * of {@link #isInAbsoluteStart()} and {@link #isInAbsoluteEnd()}. Essentially needed simply
- * because the implementation depends on the layout manager implementation being used.
- */
- protected interface Impl {
- boolean isInAbsoluteStart();
-
- boolean isInAbsoluteEnd();
- }
-
- protected final RecyclerView mRecyclerView;
- protected final Impl mImpl;
-
- protected boolean mIsItemTouchInEffect = false;
-
- public RecyclerViewOverScrollDecorAdapter(RecyclerView recyclerView) {
-
- mRecyclerView = recyclerView;
-
- final RecyclerView.LayoutManager layoutManager = recyclerView.getLayoutManager();
- if (layoutManager instanceof LinearLayoutManager ||
- layoutManager instanceof StaggeredGridLayoutManager) {
- final int orientation =
- (layoutManager instanceof LinearLayoutManager
- ? ((LinearLayoutManager) layoutManager).getOrientation()
- : ((StaggeredGridLayoutManager) layoutManager).getOrientation());
-
- if (orientation == LinearLayoutManager.HORIZONTAL) {
- mImpl = new ImplHorizLayout();
- } else {
- mImpl = new ImplVerticalLayout();
- }
- } else {
- throw new IllegalArgumentException("Recycler views with custom layout managers are not supported by this adapter out of the box." +
- "Try implementing and providing an explicit 'impl' parameter to the other c'tors, or otherwise create a custom adapter subclass of your own.");
- }
- }
-
- public RecyclerViewOverScrollDecorAdapter(RecyclerView recyclerView, Impl impl) {
- mRecyclerView = recyclerView;
- mImpl = impl;
- }
-
- public RecyclerViewOverScrollDecorAdapter(RecyclerView recyclerView, ItemTouchHelper.Callback itemTouchHelperCallback) {
- this(recyclerView);
- setUpTouchHelperCallback(itemTouchHelperCallback);
- }
-
- public RecyclerViewOverScrollDecorAdapter(RecyclerView recyclerView, Impl impl, ItemTouchHelper.Callback itemTouchHelperCallback) {
- this(recyclerView, impl);
- setUpTouchHelperCallback(itemTouchHelperCallback);
- }
-
- protected void setUpTouchHelperCallback(final ItemTouchHelper.Callback itemTouchHelperCallback) {
- new ItemTouchHelper(new ItemTouchHelperCallbackWrapper(itemTouchHelperCallback) {
- @Override
- public void onSelectedChanged(RecyclerView.ViewHolder viewHolder, int actionState) {
- mIsItemTouchInEffect = actionState != 0;
- super.onSelectedChanged(viewHolder, actionState);
- }
- }).attachToRecyclerView(mRecyclerView);
- }
-
- @Override
- public View getView() {
- return mRecyclerView;
- }
-
- @Override
- public boolean isInAbsoluteStart() {
- return !mIsItemTouchInEffect && mImpl.isInAbsoluteStart();
- }
-
- @Override
- public boolean isInAbsoluteEnd() {
- return !mIsItemTouchInEffect && mImpl.isInAbsoluteEnd();
- }
-
- protected class ImplHorizLayout implements Impl {
-
- @Override
- public boolean isInAbsoluteStart() {
- return !mRecyclerView.canScrollHorizontally(-1);
- }
-
- @Override
- public boolean isInAbsoluteEnd() {
- return !mRecyclerView.canScrollHorizontally(1);
- }
- }
-
- protected class ImplVerticalLayout implements Impl {
-
- @Override
- public boolean isInAbsoluteStart() {
- return !mRecyclerView.canScrollVertically(-1);
- }
-
- @Override
- public boolean isInAbsoluteEnd() {
- return !mRecyclerView.canScrollVertically(1);
- }
- }
-
- private static class ItemTouchHelperCallbackWrapper extends ItemTouchHelper.Callback {
-
- final ItemTouchHelper.Callback mCallback;
-
- private ItemTouchHelperCallbackWrapper(ItemTouchHelper.Callback callback) {
- mCallback = callback;
- }
-
- @Override
- public int getMovementFlags(RecyclerView recyclerView, RecyclerView.ViewHolder viewHolder) {
- return mCallback.getMovementFlags(recyclerView, viewHolder);
- }
-
- @Override
- public boolean onMove(RecyclerView recyclerView, RecyclerView.ViewHolder viewHolder, RecyclerView.ViewHolder target) {
- return mCallback.onMove(recyclerView, viewHolder, target);
- }
-
- @Override
- public void onSwiped(RecyclerView.ViewHolder viewHolder, int direction) {
- mCallback.onSwiped(viewHolder, direction);
- }
-
- @Override
- public int convertToAbsoluteDirection(int flags, int layoutDirection) {
- return mCallback.convertToAbsoluteDirection(flags, layoutDirection);
- }
-
- @Override
- public boolean canDropOver(RecyclerView recyclerView, RecyclerView.ViewHolder current, RecyclerView.ViewHolder target) {
- return mCallback.canDropOver(recyclerView, current, target);
- }
-
- @Override
- public boolean isLongPressDragEnabled() {
- return mCallback.isLongPressDragEnabled();
- }
-
- @Override
- public boolean isItemViewSwipeEnabled() {
- return mCallback.isItemViewSwipeEnabled();
- }
-
- @Override
- public int getBoundingBoxMargin() {
- return mCallback.getBoundingBoxMargin();
- }
-
- @Override
- public float getSwipeThreshold(RecyclerView.ViewHolder viewHolder) {
- return mCallback.getSwipeThreshold(viewHolder);
- }
-
- @Override
- public float getMoveThreshold(RecyclerView.ViewHolder viewHolder) {
- return mCallback.getMoveThreshold(viewHolder);
- }
-
- @Override
- public RecyclerView.ViewHolder chooseDropTarget(RecyclerView.ViewHolder selected, List dropTargets, int curX, int curY) {
- return mCallback.chooseDropTarget(selected, dropTargets, curX, curY);
- }
-
- @Override
- public void onSelectedChanged(RecyclerView.ViewHolder viewHolder, int actionState) {
- mCallback.onSelectedChanged(viewHolder, actionState);
- }
-
- @Override
- public void onMoved(RecyclerView recyclerView, RecyclerView.ViewHolder viewHolder, int fromPos, RecyclerView.ViewHolder target, int toPos, int x, int y) {
- mCallback.onMoved(recyclerView, viewHolder, fromPos, target, toPos, x, y);
- }
-
- @Override
- public void clearView(RecyclerView recyclerView, RecyclerView.ViewHolder viewHolder) {
- mCallback.clearView(recyclerView, viewHolder);
- }
-
- @Override
- public void onChildDraw(Canvas c, RecyclerView recyclerView, RecyclerView.ViewHolder viewHolder, float dX, float dY, int actionState, boolean isCurrentlyActive) {
- mCallback.onChildDraw(c, recyclerView, viewHolder, dX, dY, actionState, isCurrentlyActive);
- }
-
- @Override
- public void onChildDrawOver(Canvas c, RecyclerView recyclerView, RecyclerView.ViewHolder viewHolder, float dX, float dY, int actionState, boolean isCurrentlyActive) {
- mCallback.onChildDrawOver(c, recyclerView, viewHolder, dX, dY, actionState, isCurrentlyActive);
- }
-
- @Override
- public long getAnimationDuration(RecyclerView recyclerView, int animationType, float animateDx, float animateDy) {
- return mCallback.getAnimationDuration(recyclerView, animationType, animateDx, animateDy);
- }
-
- @Override
- public int interpolateOutOfBoundsScroll(RecyclerView recyclerView, int viewSize, int viewSizeOutOfBounds, int totalSize, long msSinceStartScroll) {
- return mCallback.interpolateOutOfBoundsScroll(recyclerView, viewSize, viewSizeOutOfBounds, totalSize, msSinceStartScroll);
- }
- }
-}
\ No newline at end of file
diff --git a/app/src/main/java/org/nv95/openmanga/components/reader/recyclerpager/overscroll/VerticalOverScrollBounceEffectDecorator.java b/app/src/main/java/org/nv95/openmanga/components/reader/recyclerpager/overscroll/VerticalOverScrollBounceEffectDecorator.java
deleted file mode 100644
index 671b3331..00000000
--- a/app/src/main/java/org/nv95/openmanga/components/reader/recyclerpager/overscroll/VerticalOverScrollBounceEffectDecorator.java
+++ /dev/null
@@ -1,98 +0,0 @@
-package org.nv95.openmanga.components.reader.recyclerpager.overscroll;
-
-import android.view.MotionEvent;
-import android.view.View;
-
-/**
- * A concrete implementation of {@link OverScrollBounceEffectDecoratorBase} for a vertical orientation.
- *
- * @author amit
- */
-public class VerticalOverScrollBounceEffectDecorator extends OverScrollBounceEffectDecoratorBase {
-
- protected static class MotionAttributesVertical extends MotionAttributes {
-
- public boolean init(View view, MotionEvent event) {
-
- // We must have history available to calc the dx. Normally it's there - if it isn't temporarily,
- // we declare the event 'invalid' and expect it in consequent events.
- if (event.getHistorySize() == 0) {
- return false;
- }
-
- // Allow for counter-orientation-direction operations (e.g. item swiping) to run fluently.
- final float dy = event.getY(0) - event.getHistoricalY(0, 0);
- final float dx = event.getX(0) - event.getHistoricalX(0, 0);
- if (Math.abs(dx) > Math.abs(dy)) {
- return false;
- }
-
- mAbsOffset = view.getTranslationY();
- mDeltaOffset = dy;
- mDir = mDeltaOffset > 0;
-
- return true;
- }
- }
-
- protected static class AnimationAttributesVertical extends AnimationAttributes {
-
- public AnimationAttributesVertical() {
- mProperty = View.TRANSLATION_Y;
- }
-
- @Override
- protected void init(View view) {
- mAbsOffset = view.getTranslationY();
- mMaxOffset = view.getHeight();
- }
- }
-
- /**
- * C'tor, creating the effect with default arguments:
- *
Touch-drag ratio in 'forward' direction will be set to DEFAULT_TOUCH_DRAG_MOVE_RATIO_FWD.
- *
Touch-drag ratio in 'backwards' direction will be set to DEFAULT_TOUCH_DRAG_MOVE_RATIO_BCK.
- *
Deceleration factor (for the bounce-back effect) will be set to DEFAULT_DECELERATE_FACTOR.
- *
- * @param viewAdapter The view's encapsulation.
- */
- public VerticalOverScrollBounceEffectDecorator(IOverScrollDecoratorAdapter viewAdapter) {
- this(viewAdapter, DEFAULT_TOUCH_DRAG_MOVE_RATIO_FWD, DEFAULT_TOUCH_DRAG_MOVE_RATIO_BCK, DEFAULT_DECELERATE_FACTOR);
- }
-
- /**
- * C'tor, creating the effect with explicit arguments.
- *
- * @param viewAdapter The view's encapsulation.
- * @param touchDragRatioFwd Ratio of touch distance to actual drag distance when in 'forward' direction.
- * @param touchDragRatioBck Ratio of touch distance to actual drag distance when in 'backward'
- * direction (opposite to initial one).
- * @param decelerateFactor Deceleration factor used when decelerating the motion to create the
- * bounce-back effect.
- */
- public VerticalOverScrollBounceEffectDecorator(IOverScrollDecoratorAdapter viewAdapter,
- float touchDragRatioFwd, float touchDragRatioBck, float decelerateFactor) {
- super(viewAdapter, decelerateFactor, touchDragRatioFwd, touchDragRatioBck);
- }
-
- @Override
- protected MotionAttributes createMotionAttributes() {
- return new MotionAttributesVertical();
- }
-
- @Override
- protected AnimationAttributes createAnimationAttributes() {
- return new AnimationAttributesVertical();
- }
-
- @Override
- protected void translateView(View view, float offset) {
- view.setTranslationY(offset);
- }
-
- @Override
- protected void translateViewAndEvent(View view, float offset, MotionEvent event) {
- view.setTranslationY(offset);
- event.offsetLocation(offset - event.getY(0), 0f);
- }
-}
\ No newline at end of file
diff --git a/app/src/main/java/org/nv95/openmanga/components/reader/webtoon/AsyncBitmapDecoder.java b/app/src/main/java/org/nv95/openmanga/components/reader/webtoon/AsyncBitmapDecoder.java
deleted file mode 100644
index 91482780..00000000
--- a/app/src/main/java/org/nv95/openmanga/components/reader/webtoon/AsyncBitmapDecoder.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package org.nv95.openmanga.components.reader.webtoon;
-
-import android.graphics.Bitmap;
-import android.graphics.BitmapFactory;
-import android.support.annotation.Nullable;
-import android.support.annotation.WorkerThread;
-
-import java.util.concurrent.Executor;
-
-/**
- * Created by admin on 02.08.17.
- */
-
-public class AsyncBitmapDecoder implements Runnable {
-
- private final String mFilename;
- private final DecodeCallback mCallback;
-
- public AsyncBitmapDecoder(String filename, DecodeCallback callback) {
- mFilename = filename;
- mCallback = callback;
- }
-
- @Override
- public void run() {
- try {
- Bitmap bitmap = BitmapFactory.decodeFile(mFilename);
- mCallback.onBitmapDecoded(bitmap);
- } catch (Exception e) {
- e.printStackTrace();
- }
- }
-
- public interface DecodeCallback {
- @WorkerThread
- void onBitmapDecoded(@Nullable Bitmap bitmap);
- }
-
- public static void decode(String filename, DecodeCallback callback, Executor executor) {
- executor.execute(new AsyncBitmapDecoder(filename, callback));
- }
-}
diff --git a/app/src/main/java/org/nv95/openmanga/components/reader/webtoon/AsyncScroller.java b/app/src/main/java/org/nv95/openmanga/components/reader/webtoon/AsyncScroller.java
deleted file mode 100644
index 5d011a7c..00000000
--- a/app/src/main/java/org/nv95/openmanga/components/reader/webtoon/AsyncScroller.java
+++ /dev/null
@@ -1,102 +0,0 @@
-package org.nv95.openmanga.components.reader.webtoon;
-
-import android.content.Context;
-import android.os.Handler;
-import android.os.Message;
-import android.support.annotation.Nullable;
-import android.widget.Scroller;
-
-
-/**
- * Created by admin on 15.08.17.
- */
-
-public class AsyncScroller extends Scroller implements Handler.Callback {
-
- private final OnFlyListener mListener;
- private final Handler mHandler;
- @Nullable
- private WatcherThread mThread = null;
-
- public AsyncScroller(Context context, OnFlyListener listener) {
- super(context);
- mHandler = new Handler(this);
- mListener = listener;
- }
-
- @Override
- public void fling(int startX, int startY, int velocityX, int velocityY, int minX, int maxX, int minY, int maxY) {
- if (mThread != null) {
- mThread.interrupt();
- }
- mThread = new WatcherThread(startX, startY);
- super.fling(startX, startY, velocityX, velocityY, minX, maxX, minY, maxY);
- mThread.start();
- }
-
- @Override
- public void startScroll(int startX, int startY, int dx, int dy) {
- if (mThread != null) {
- mThread.interrupt();
- }
- mThread = new WatcherThread(startX, startY);
- super.startScroll(startX, startY, dx, dy);
- mThread.start();
- }
-
- @Override
- public void startScroll(int startX, int startY, int dx, int dy, int duration) {
- if (mThread != null) {
- mThread.interrupt();
- }
- mThread = new WatcherThread(startX, startY);
- super.startScroll(startX, startY, dx, dy, duration);
- mThread.start();
- }
-
- @Override
- public boolean handleMessage(Message message) {
- mListener.onScrolled(message.arg1, message.arg2);
- return false;
- }
-
- private class WatcherThread extends Thread {
-
- private int oldX, oldY;
-
- public WatcherThread(int oldX, int oldY) {
- this.oldX = oldX;
- this.oldY = oldY;
- }
-
- @Override
- public void run() {
- while (!isInterrupted() && !AsyncScroller.this.isFinished()) {
- if (computeScrollOffset()) {
- Message msg = new Message();
- msg.arg1 = getCurrX();
- msg.arg2 = getCurrY();
- if (msg.arg1 != oldX || msg.arg2 != oldY) {
- mHandler.sendMessage(msg);
- oldX = msg.arg1;
- oldY = msg.arg2;
- }
- }
- }
- super.run();
- }
- }
-
- @Override
- public void abortAnimation() {
- if (mThread != null) {
- mThread.interrupt();
- mThread = null;
- }
- super.abortAnimation();
- }
-
- public interface OnFlyListener {
- void onScrolled(int currentX, int currentY);
- }
-}
diff --git a/app/src/main/java/org/nv95/openmanga/components/reader/webtoon/ChangesListener.java b/app/src/main/java/org/nv95/openmanga/components/reader/webtoon/ChangesListener.java
deleted file mode 100644
index 1b2d233f..00000000
--- a/app/src/main/java/org/nv95/openmanga/components/reader/webtoon/ChangesListener.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package org.nv95.openmanga.components.reader.webtoon;
-
-/**
- * Created by admin on 03.08.17.
- */
-
-public interface ChangesListener {
-
- void notifyDataSetChanged();
-}
diff --git a/app/src/main/java/org/nv95/openmanga/components/reader/webtoon/DrawableView.java b/app/src/main/java/org/nv95/openmanga/components/reader/webtoon/DrawableView.java
deleted file mode 100644
index c31b23af..00000000
--- a/app/src/main/java/org/nv95/openmanga/components/reader/webtoon/DrawableView.java
+++ /dev/null
@@ -1,348 +0,0 @@
-package org.nv95.openmanga.components.reader.webtoon;
-
-import android.content.Context;
-import android.graphics.Canvas;
-import android.graphics.Rect;
-import android.support.annotation.MainThread;
-import android.support.annotation.Nullable;
-import android.support.annotation.WorkerThread;
-import android.util.AttributeSet;
-import android.view.GestureDetector;
-import android.view.MotionEvent;
-import android.view.ScaleGestureDetector;
-import android.view.SurfaceHolder;
-import android.view.SurfaceView;
-
-import java.util.concurrent.atomic.AtomicReference;
-
-/**
- * Created by admin on 14.08.17.
- */
-
-public abstract class DrawableView extends SurfaceView implements SurfaceHolder.Callback, ScaleGestureDetector.OnScaleGestureListener, AsyncScroller.OnFlyListener, ScaleAnimator.ZoomCallback {
-
- @Nullable
- private DrawThread mThread;
- private final GestureDetector mGestureDetector;
- private final ScaleGestureDetector mScaleDetector;
- private final AsyncScroller mScroller;
- private final Rect mViewport;
- protected final AtomicReference mScrollState;
-
- public DrawableView(Context context) {
- this(context, null, 0);
- }
-
- public DrawableView(Context context, AttributeSet attrs) {
- this(context, attrs, 0);
- }
-
- public DrawableView(Context context, AttributeSet attrs, int defStyleAttr) {
- super(context, attrs, defStyleAttr);
- mGestureDetector = new GestureDetector(context, new GestureListener());
- mScaleDetector = new ScaleGestureDetector(context, this);
- mScroller = new AsyncScroller(context, this);
- mViewport = new Rect(0, 0, 0, 0);
- mThread = null;
- mScrollState = new AtomicReference<>(new ScrollState(1f, 0, 0));
- SurfaceHolder holder = getHolder();
- holder.addCallback(this);
- }
-
- @Override
- public void surfaceCreated(SurfaceHolder surfaceHolder) {
- mThread = new DrawThread(surfaceHolder);
- mThread.start();
- }
-
- @Override
- public void surfaceChanged(SurfaceHolder surfaceHolder, int format, int width, int height) {
- int oldHeight = mViewport.height();
- int oldWidth = mViewport.width();
- mViewport.set(0, 0, width, height);
- onViewportChanged(oldHeight, oldWidth, height, width);
- forceRedraw();
- }
-
- @Override
- public void surfaceDestroyed(SurfaceHolder surfaceHolder) {
- if (mThread != null) {
- mThread.interrupt();
- }
- }
-
- @Override
- public boolean onTouchEvent(MotionEvent event) {
- mGestureDetector.onTouchEvent(event);
- mScaleDetector.onTouchEvent(event);
- return true;
- }
-
- @Override
- public boolean onScale(ScaleGestureDetector detector) {
- ScrollState state = mScrollState.get();
-
- float scaleFactor = state.scale;
- scaleFactor *= detector.getScaleFactor();
- if (scaleFactor < 1f) {
- if (state.scale == 1f) {
- return false;
- } else {
- scaleFactor = 1f;
- }
- } else if (scaleFactor > 2f) {
- if (state.scale == 2f) {
- return false;
- } else {
- scaleFactor = 2f;
- }
- }
-
-
- float scrollFactor = scaleFactor - state.scale;
- int newScrollX = (int) (state.scrollX + detector.getFocusX() * scrollFactor);
- int newScrollY = (int) (state.scrollY + detector.getFocusY() * scrollFactor);
-
- mScrollState.set(new ScrollState(scaleFactor, newScrollX, newScrollY));
- onZoomChanged();
- return true;
- }
-
- @Override
- public boolean onScaleBegin(ScaleGestureDetector scaleGestureDetector) {
- return true;
- }
-
- @Override
- public void onScaleEnd(ScaleGestureDetector scaleGestureDetector) {
-
- }
-
- @Override
- public void onZoomAnimated(float scale, int scrollX, int scrollY) {
- Rect bounds = computeScrollRange(scale);
-
- if (scrollX < bounds.left) scrollX = bounds.left;
- else if (scrollX > bounds.right) scrollX = bounds.right;
-
- if (scrollY < bounds.top) scrollY = bounds.top;
- else if (scrollY > bounds.bottom) scrollY = bounds.bottom;
-
- mScrollState.set(new ScrollState(scale, scrollX, scrollY));
- }
-
- @Override
- public void onZoomAnimationFinished() {
- onZoomChanged();
- }
-
- private class GestureListener extends GestureDetector.SimpleOnGestureListener {
-
- @Override
- public boolean onFling(MotionEvent e1, MotionEvent e2, float velocityX, float velocityY) {
- Rect bounds = getScrollBounds();
- ScrollState state = mScrollState.get();
- mScroller.fling(
- state.scrollX,
- state.scrollY,
- -(int) velocityX,
- -(int) velocityY,
- bounds.left,
- bounds.right,
- bounds.top,
- bounds.bottom);
- awakenScrollBars(mScroller.getDuration());
- return true;
- }
-
- @Override
- public boolean onScroll(MotionEvent e1, MotionEvent e2, float distanceX, float distanceY) {
- if (e2.getPointerCount() != 1) return false;
-
- Rect bounds = getScrollBounds();
- ScrollState state = mScrollState.get();
- int scrollY = (int) (state.scrollY + distanceY);
- int scrollX = (int) (state.scrollX + distanceX);
-
- if (scrollX < bounds.left) scrollX = bounds.left;
- else if (scrollX > bounds.right) scrollX = bounds.right;
-
- if (scrollY < bounds.top) scrollY = bounds.top;
- else if (scrollY > bounds.bottom) scrollY = bounds.bottom;
-
- mScrollState.set(state.offset(scrollX, scrollY));
-
- return super.onScroll(e1, e2, distanceX, distanceY);
- }
-
- @Override
- public boolean onDown(MotionEvent e) {
- if (e.getPointerCount() == 1) {
- mScroller.abortAnimation();
- }
- return super.onDown(e);
- }
-
- @Override
- public boolean onDoubleTap(MotionEvent e) {
- ScaleAnimator animator = new ScaleAnimator(DrawableView.this);
- ScrollState state = mScrollState.get();
- if (state.scale == 1f) {
- animator.animate(
- state.scale,
- state.scrollX,
- state.scrollY,
- 1.6f,
- (int) (state.scrollX + e.getX() * 1.6f),
- (int) (state.scrollY + e.getY() * 1.6f)
- );
- } else {
- animator.animate(
- state.scale,
- state.scrollX,
- state.scrollY,
- 1f,
- (int) (state.scrollX - e.getX() * 1.6f),
- (int) (state.scrollY - e.getY() * 1.6f)
- );
- }
- return super.onDoubleTap(e);
- }
- }
-
-
- @Override
- public void onScrolled(int currentX, int currentY) {
- mScrollState.set(mScrollState.get().offset(currentX, currentY));
- }
-
- public void forceRedraw() {
- if (mThread != null) {
- mThread.force = true;
- }
- }
-
- @Override
- public boolean canScrollHorizontally(int direction) {
- Rect bounds = getScrollBounds();
- ScrollState state = mScrollState.get();
- if (direction < 0) {
- return state.scrollX > bounds.right;
- } else if (direction > 0) {
- return state.scrollX < bounds.left;
- } else return super.canScrollHorizontally(direction);
- }
-
- @Override
- public boolean canScrollVertically(int direction) {
- Rect bounds = getScrollBounds();
- ScrollState state = mScrollState.get();
- if (direction < 0) {
- return state.scrollY > bounds.top;
- } else if (direction > 0) {
- return state.scrollY < bounds.bottom;
- } else return super.canScrollVertically(direction);
- }
-
- private class DrawThread extends Thread {
-
- private final SurfaceHolder mSurface;
-
- private int lastOffsetX = 0, lastOffsetY = 0;
- private float lastZoom = 0;
- boolean force;
-
- DrawThread(SurfaceHolder surface) {
- mSurface = surface;
- }
-
- @Override
- public void run() {
- Canvas canvas;
- while (!interrupted()) {
- canvas = null;
- try {
- // получаем объект Canvas и выполняем отрисовку
- ScrollState state = mScrollState.get();
- int offsetX = -state.scrollX;
- int offsetY = -state.scrollY;
- if (!force && lastOffsetX == offsetX && lastOffsetY == offsetY && lastZoom == state.scale) {
- continue;
- }
- force = false;
- canvas = mSurface.lockCanvas(null);
- synchronized (mSurface) {
- //long time = System.currentTimeMillis();
- onSurfaceDraw(canvas, lastOffsetX - offsetX, lastOffsetY - offsetY, state.scale);
- /*time = System.currentTimeMillis() - time;
- Log.d("FPS", 1f / time * 1000f + " fps");*/
-
- lastOffsetX = offsetX;
- lastOffsetY = offsetY;
- lastZoom = state.scale;
- }
- } catch (Exception e) {
- e.printStackTrace();
- } finally {
- if (canvas != null) {
- // отрисовка выполнена. выводим результат на экран
- mSurface.unlockCanvasAndPost(canvas);
- }
- }
- }
- }
- }
-
- public boolean smoothScrollBy(int dX, int dY) {
- mScroller.forceFinished(true);
- Rect bounds = getScrollBounds();
- ScrollState state = mScrollState.get();
- if (dY < 0) {
- dY = Math.max(dY, bounds.top - state.scrollY);
- } else if (dY > 0) {
- dY = Math.min(dY, bounds.bottom - state.scrollY);
- }
- if (dX < 0) {
- dX = Math.max(dX, bounds.left - state.scrollY);
- } else if (dX > 0) {
- dX = Math.min(dX, bounds.right - state.scrollY);
- }
- if (dX == 0 && dY == 0) {
- return false;
- }
- mScroller.startScroll(
- state.scrollX,
- state.scrollY,
- dX,
- dY,
- 800
- );
- return true;
- }
-
- public float getScaleFactor() {
- return mScrollState.get().scale;
- }
-
- public int getViewportWidth() {
- return mViewport.width();
- }
-
- public int getViewportHeight() {
- return mViewport.height();
- }
-
- @WorkerThread
- protected abstract void onSurfaceDraw(Canvas canvas, int dX, int dY, float zoom);
-
- protected void onIdle(){}
-
- protected void onViewportChanged(int oldHeight, int oldWidth, int newHeight, int newWidth){};
-
- protected void onZoomChanged(){};
-
- @MainThread
- protected abstract Rect getScrollBounds();
-
- protected abstract Rect computeScrollRange(float scale);
-}
diff --git a/app/src/main/java/org/nv95/openmanga/components/reader/webtoon/ImagesPool.java b/app/src/main/java/org/nv95/openmanga/components/reader/webtoon/ImagesPool.java
deleted file mode 100644
index b5450796..00000000
--- a/app/src/main/java/org/nv95/openmanga/components/reader/webtoon/ImagesPool.java
+++ /dev/null
@@ -1,94 +0,0 @@
-package org.nv95.openmanga.components.reader.webtoon;
-
-import android.content.Context;
-import android.graphics.Bitmap;
-import android.support.annotation.Nullable;
-import android.support.annotation.WorkerThread;
-
-import org.nv95.openmanga.components.reader.PageLoader;
-import org.nv95.openmanga.components.reader.PageWrapper;
-
-import java.util.Collections;
-import java.util.Set;
-import java.util.TreeSet;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-
-/**
- * Created by admin on 01.08.17.
- */
-
-public class ImagesPool {
-
- private final PagesLruCache mCache;
- private final PageLoader mLoader;
- private final ChangesListener mListener;
- private final ExecutorService mExecutor;
- private final Set mDecodeQueue;
- private int mBaseWidth = 0;
-
- public ImagesPool(Context context, ChangesListener listener) {
- mExecutor = Executors.newSingleThreadExecutor();
- mLoader = new PageLoader(context);
- mListener = listener;
- mDecodeQueue = Collections.synchronizedSet(new TreeSet());
- mCache = new PagesLruCache(4);
- }
-
- @Nullable
- public PageImage get(int pos) {
- PageImage page = mCache.get(pos);
- if (page != null && !page.isRecycled()) {
- return page;
- }
- load(pos);
- return null;
- }
-
- public void prefetch(final int pos) {
- if (!mCache.contains(pos)) {
- load(pos);
- }
- }
-
- private void load(final int pos) {
- PageWrapper pw = mLoader.requestPage(pos);
- if (pw != null && pw.isLoaded() && !mDecodeQueue.contains(pos)) {
- mDecodeQueue.add(pos);
- AsyncBitmapDecoder.decode(pw.getFilename(), new AsyncBitmapDecoder.DecodeCallback() {
- @WorkerThread
- @Override
- public void onBitmapDecoded(@Nullable Bitmap bitmap) {
- if (bitmap != null) {
- int w = bitmap.getWidth();
- int h = (int)(mBaseWidth / (float)w * bitmap.getHeight());
- mCache.put(pos, new PageImage(Bitmap.createScaledBitmap(
- bitmap,
- mBaseWidth,
- h,
- true
- )));
- bitmap.recycle();
- mListener.notifyDataSetChanged();
- }
- mDecodeQueue.remove(pos);
- }
- }, mExecutor);
- }
- }
-
- public PageLoader getLoader() {
- return mLoader;
- }
-
- public void recycle() {
- mCache.evictAll();
- }
-
- public void setBaseWidth(int width) {
- if (mBaseWidth != width) {
- mCache.evictAll();
- mBaseWidth = width;
- }
- }
-}
diff --git a/app/src/main/java/org/nv95/openmanga/components/reader/webtoon/PageImage.java b/app/src/main/java/org/nv95/openmanga/components/reader/webtoon/PageImage.java
deleted file mode 100644
index 3b723338..00000000
--- a/app/src/main/java/org/nv95/openmanga/components/reader/webtoon/PageImage.java
+++ /dev/null
@@ -1,58 +0,0 @@
-package org.nv95.openmanga.components.reader.webtoon;
-
-import android.graphics.Bitmap;
-import android.graphics.Canvas;
-import android.graphics.Paint;
-import android.graphics.Rect;
-import android.support.annotation.NonNull;
-
-import org.nv95.openmanga.utils.DecartUtils;
-
-/**
- * Created by admin on 01.08.17.
- */
-
-public class PageImage {
-
- @NonNull
- private final Bitmap mBitmap;
-
- public PageImage(@NonNull Bitmap bitmap) {
- mBitmap = bitmap;
- }
-
- public int getHeight() {
- return mBitmap.getHeight();
- }
-
- public int getWidth() {
- return mBitmap.getWidth();
- }
-
- public Rect draw(Canvas canvas, Paint paint, int offsetX, int offsetY, Rect viewport, float scale) {
- Rect outRect = new Rect(
- offsetX,
- offsetY,
- ((int) (offsetX + (getWidth() * scale))),
- (int) (offsetY + (getHeight() * scale))
- );
- DecartUtils.trimRect(outRect, viewport);
- if (!isRecycled()) {
- Rect inRect = new Rect(outRect);
- DecartUtils.translateRect(inRect, -offsetX, -offsetY);
- if (scale != 1f) {
- DecartUtils.scaleRect(inRect, 1f / scale);
- }
- canvas.drawBitmap(mBitmap, inRect, outRect, paint);
- }
- return outRect;
- }
-
- public boolean isRecycled() {
- return mBitmap.isRecycled();
- }
-
- public void recycle() {
- mBitmap.recycle();
- }
-}
diff --git a/app/src/main/java/org/nv95/openmanga/components/reader/webtoon/PagesLruCache.java b/app/src/main/java/org/nv95/openmanga/components/reader/webtoon/PagesLruCache.java
deleted file mode 100644
index 4073b085..00000000
--- a/app/src/main/java/org/nv95/openmanga/components/reader/webtoon/PagesLruCache.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package org.nv95.openmanga.components.reader.webtoon;
-
-import android.util.LruCache;
-
-/**
- * Created by admin on 02.08.17.
- */
-
-public class PagesLruCache extends LruCache {
-
- public PagesLruCache(int maxSize) {
- super(maxSize);
- }
-
- @Override
- protected void entryRemoved(boolean evicted, Integer key, PageImage oldValue, PageImage newValue) {
- oldValue.recycle();
- }
-
- public boolean contains(Integer key) {
- PageImage value = get(key);
- return value != null && !value.isRecycled();
- }
-}
diff --git a/app/src/main/java/org/nv95/openmanga/components/reader/webtoon/ScaleAnimator.java b/app/src/main/java/org/nv95/openmanga/components/reader/webtoon/ScaleAnimator.java
deleted file mode 100644
index fb3f3695..00000000
--- a/app/src/main/java/org/nv95/openmanga/components/reader/webtoon/ScaleAnimator.java
+++ /dev/null
@@ -1,95 +0,0 @@
-package org.nv95.openmanga.components.reader.webtoon;
-
-import android.animation.Animator;
-import android.animation.TypeEvaluator;
-import android.animation.ValueAnimator;
-import android.support.annotation.Nullable;
-import android.view.animation.AccelerateDecelerateInterpolator;
-
-/**
- * Created by admin on 15.08.17.
- */
-
-public class ScaleAnimator implements ValueAnimator.AnimatorUpdateListener, Animator.AnimatorListener {
-
- private final ZoomCallback mCallback;
- @Nullable
- private ValueAnimator mAnimator;
-
- public ScaleAnimator(ZoomCallback callback) {
- mCallback = callback;
- }
-
- public void animate(float initialScale, int initialX, int initialY, float targetScale, int targetX, int targetY) {
- if (mAnimator != null) {
- mAnimator.cancel();
- }
- mAnimator = ValueAnimator.ofObject(
- new ZoomEvaluator(),
- new ZoomState(initialScale, initialX, initialY),
- new ZoomState(targetScale, targetX, targetY)
- );
- assert mAnimator != null;
- mAnimator.setInterpolator(new AccelerateDecelerateInterpolator());
- mAnimator.setDuration(500);
- mAnimator.addUpdateListener(this);
- mAnimator.addListener(this);
- mAnimator.start();
- }
-
- @Override
- public void onAnimationUpdate(ValueAnimator valueAnimator) {
- ZoomState curState = (ZoomState) valueAnimator.getAnimatedValue();
- mCallback.onZoomAnimated(curState.scale, curState.offsetX, curState.offsetY);
- }
-
- @Override
- public void onAnimationStart(Animator animator) {
-
- }
-
- @Override
- public void onAnimationEnd(Animator animator) {
- mCallback.onZoomAnimationFinished();
- }
-
- @Override
- public void onAnimationCancel(Animator animator) {
-
- }
-
- @Override
- public void onAnimationRepeat(Animator animator) {
-
- }
-
- public static class ZoomState {
-
- final float scale;
- final int offsetX;
- final int offsetY;
-
- ZoomState(float scale, int offsetX, int offsetY) {
- this.scale = scale;
- this.offsetX = offsetX;
- this.offsetY = offsetY;
- }
- }
-
- private static class ZoomEvaluator implements TypeEvaluator {
-
- @Override
- public ZoomState evaluate(float fraction, ZoomState startValue, ZoomState endValue) {
- return new ZoomState(
- startValue.scale + fraction * (endValue.scale - startValue.scale),
- (int)(startValue.offsetX + fraction * (endValue.offsetX - startValue.offsetX)),
- (int)(startValue.offsetY + fraction * (endValue.offsetY - startValue.offsetY))
- );
- }
- }
-
- public interface ZoomCallback {
- void onZoomAnimated(float scale, int scrollX, int scrollY);
- void onZoomAnimationFinished();
- }
-}
diff --git a/app/src/main/java/org/nv95/openmanga/components/reader/webtoon/ScrollState.java b/app/src/main/java/org/nv95/openmanga/components/reader/webtoon/ScrollState.java
deleted file mode 100644
index e4d07807..00000000
--- a/app/src/main/java/org/nv95/openmanga/components/reader/webtoon/ScrollState.java
+++ /dev/null
@@ -1,38 +0,0 @@
-package org.nv95.openmanga.components.reader.webtoon;
-
-/**
- * Created by admin on 15.08.17.
- */
-
-class ScrollState {
-
- final float scale;
- final int scrollX;
- final int scrollY;
-
- ScrollState(float scale, int scrollX, int scrollY) {
- this.scale = scale;
- this.scrollX = scrollX;
- this.scrollY = scrollY;
- }
-
- public ScrollState scale(float newScale) {
- return new ScrollState(newScale, scrollX, scrollY);
- }
-
- public ScrollState offsetX(int newOffsetX) {
- return new ScrollState(scale, newOffsetX, scrollY);
- }
-
- public ScrollState offsetY(int newOffsetY) {
- return new ScrollState(scale, scrollX, newOffsetY);
- }
-
- public ScrollState offset(int newOffsetX, int newOffsetY) {
- return new ScrollState(scale, newOffsetX, newOffsetY);
- }
-
- public ScrollState offsetRel(int deltaX, int deltaY) {
- return new ScrollState(scale, scrollX + deltaX, scrollY + deltaY);
- }
-}
diff --git a/app/src/main/java/org/nv95/openmanga/components/reader/webtoon/WebtoonReader.java b/app/src/main/java/org/nv95/openmanga/components/reader/webtoon/WebtoonReader.java
deleted file mode 100644
index ab4a323d..00000000
--- a/app/src/main/java/org/nv95/openmanga/components/reader/webtoon/WebtoonReader.java
+++ /dev/null
@@ -1,411 +0,0 @@
-package org.nv95.openmanga.components.reader.webtoon;
-
-import android.annotation.SuppressLint;
-import android.content.Context;
-import android.graphics.Canvas;
-import android.graphics.Color;
-import android.graphics.Paint;
-import android.graphics.Rect;
-import android.os.Handler;
-import android.os.Message;
-import android.support.annotation.Nullable;
-import android.support.annotation.WorkerThread;
-import android.util.AttributeSet;
-import android.util.SparseIntArray;
-import android.view.MotionEvent;
-
-import org.nv95.openmanga.components.reader.MangaReader;
-import org.nv95.openmanga.components.reader.OnOverScrollListener;
-import org.nv95.openmanga.components.reader.OverscrollDetector;
-import org.nv95.openmanga.components.reader.PageLoadListener;
-import org.nv95.openmanga.components.reader.PageLoader;
-import org.nv95.openmanga.components.reader.PageWrapper;
-import org.nv95.openmanga.components.reader.recyclerpager.RecyclerViewPager;
-import org.nv95.openmanga.items.MangaPage;
-import org.nv95.openmanga.utils.DecartUtils;
-import org.nv95.openmanga.utils.InternalLinkMovement;
-import org.nv95.openmanga.utils.LayoutUtils;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.TreeMap;
-import java.util.Vector;
-
-/**
- * Created by admin on 14.08.17.
- */
-
-public class WebtoonReader extends DrawableView implements MangaReader, PageLoadListener,
- ChangesListener, Handler.Callback {
-
- private static final int MSG_IMGSIZE = 1;
- private static final int MSG_PAGE_CHANGED = 2;
-
- private ImagesPool mPool;
- private final Paint mPaint;
- private final TreeMap mHeights;
- private int mFullHeight = 0;
- private final Handler mHandler;
- private int mCurrentPage;
- private final Vector mPageChangeListeners;
- private volatile int mOffsetX = 0, mOffsetY = 0;
- private final Rect mScrollBounds;
- private int mTopPage, mTopPageOffset;
- private volatile boolean mShowNumbers;
- private final SparseIntArray mProgressMap;
- @Nullable
- private OverscrollDetector mOverscrollDetector;
-
- public WebtoonReader(Context context) {
- this(context, null, 0);
- }
-
- public WebtoonReader(Context context, AttributeSet attrs) {
- this(context, attrs, 0);
- }
-
- public WebtoonReader(Context context, AttributeSet attrs, int defStyleAttr) {
- super(context, attrs, defStyleAttr);
- setHorizontalScrollBarEnabled(false);
- setVerticalScrollBarEnabled(true);
- mPaint = new Paint(Paint.ANTI_ALIAS_FLAG);
- mPaint.setColor(Color.DKGRAY);
- mPaint.setSubpixelText(true);
- mPaint.setTextSize(LayoutUtils.DpToPx(getResources(), 18));
- mHeights = new TreeMap<>();
- mProgressMap = new SparseIntArray();
- mHandler = new Handler(this);
- mPageChangeListeners = new Vector<>();
- mCurrentPage = 0;
- mTopPage = mTopPageOffset = 0;
- mScrollBounds = new Rect();
- mOverscrollDetector = null;
- }
-
- @WorkerThread
- @Override
- protected void onSurfaceDraw(Canvas canvas, int dX, int dY, float zoom) {
- canvas.drawColor(Color.LTGRAY);
- final Rect viewport = canvas.getClipBounds();
- if (mPool != null) {
- mOffsetY -= dY;
- mOffsetX -= dX;
- int offsetY = mOffsetY;
- int page = mCurrentPage;
- //draw previous pages
- if (offsetY > 0) {
- while (offsetY > 0) {
- PageImage image = mPool.get(page - 1);
- if (image == null) break;
- notifyPageHeight(page, image.getHeight());
- offsetY -= image.getHeight() * zoom;
- mOffsetY = offsetY;
- page--;
- notifyPageChanged(mCurrentPage - 1);
- }
- mPool.prefetch(page-1);
- }
- //draw current page and next
- while (offsetY < canvas.getHeight()) {
- PageImage image = mPool.get(page);
- if (image == null) break;
- notifyPageHeight(page, image.getHeight());
- Rect rect = image.draw(canvas, mPaint, mOffsetX, offsetY, viewport, zoom);
- if (rect.bottom <= 0) {
- mOffsetY = rect.bottom;
- notifyPageChanged(mCurrentPage + 1);
- mPool.prefetch(page + 2);
- }
- page++;
- offsetY = rect.bottom;
- }
- //prefetch next
- //mPool.prefetch(page);
-
- int progress = mProgressMap.get(mCurrentPage, 0);
- String text = "";
- if (mShowNumbers) {
- text += String.valueOf(mCurrentPage + 1);
- if (progress == -1) {
- text += " - ERROR";
- } else if (progress != 0 && progress != 100) {
- text += " - " + progress + "%";
- }
- } else {
- if (progress == -1) {
- text += "ERROR";
- } else if (progress != 0 && progress != 100) {
- text += progress + "%";
- }
- }
- canvas.drawText(text, 5, canvas.getHeight() - 10, mPaint);
- }
- }
-
- private void recomputeWidth() {
- int count = mHeights.size();
- if (count == 0) {
- mFullHeight = getViewportHeight();
- mTopPageOffset = 0;
- return;
- }
- final int total = getItemCount();
- int sum = 0;
-
- for (int o : mHeights.values()) {
- sum += o;
- }
- int avgHeight = sum / count;
- sum += avgHeight * (total - count);
-
- mTopPageOffset = 0;
- for (int i = 0; i < mTopPage; i++) {
- Integer o = mHeights.get(i);
- mTopPageOffset += o == null ? avgHeight : o;
- }
- mFullHeight = sum;
- recomputeScrollRange();
- }
-
- @Override
- protected void onViewportChanged(int oldHeight, int oldWidth, int newHeight, int newWidth) {
- if (mPool != null) {
- mPool.setBaseWidth(newWidth);
- }
- if (oldHeight != 0) {
- mFullHeight = mFullHeight / oldHeight * newHeight;
- for (Integer i : mHeights.keySet()) {
- mHeights.put(i, mHeights.get(i) / oldHeight * newHeight);
- }
- } else {
- mHeights.clear();
- }
- }
-
- @Override
- protected void onZoomChanged() {
- recomputeScrollRange();
- }
-
- private void recomputeScrollRange() {
- mScrollBounds.top = 0;
- mScrollBounds.left = 0;
- mScrollBounds.bottom = mFullHeight;
- mScrollBounds.right = getViewportWidth();
- DecartUtils.scaleRect(mScrollBounds, getScaleFactor());
- DecartUtils.translateRect(mScrollBounds, 0, -mTopPageOffset);
- mScrollBounds.bottom -= getViewportHeight();
- mScrollBounds.right -= getViewportWidth();
- }
-
- @Override
- protected void onIdle() {
- //recomputeWidth();
- }
-
- @Override
- protected Rect getScrollBounds() {
- return mScrollBounds;
- }
-
- @Override
- public void applyConfig(boolean vertical, boolean reverse, boolean sticky, boolean showNumbers) {
- mShowNumbers = showNumbers;
- }
-
- @Override
- public boolean scrollToNext(boolean animate) {
- return smoothScrollBy(0, (int) (getViewportHeight() * 0.9f));
- }
-
- @Override
- public boolean scrollToPrevious(boolean animate) {
- return smoothScrollBy(0, (int) -(getViewportHeight() * 0.9f));
- }
-
- @Override
- public int getCurrentPosition() {
- return mCurrentPage;
- }
-
- @Override
- public void scrollToPosition(int position) {
- int oldPage = mCurrentPage;
- mCurrentPage = position;
- mOffsetY = 0;
- mScrollState.set(mScrollState.get().offsetY(0));
- mTopPage = position;
- recomputeWidth();
- forceRedraw();
- for (RecyclerViewPager.OnPageChangedListener o : mPageChangeListeners) {
- o.OnPageChanged(oldPage, mCurrentPage);
- }
- }
-
- @Override
- public void setTapNavs(boolean val) {
-
- }
-
- @Override
- public void addOnPageChangedListener(RecyclerViewPager.OnPageChangedListener listener) {
- mPageChangeListeners.add(listener);
- }
-
- @Override
- public void setOnOverScrollListener(OnOverScrollListener listener) {
- mOverscrollDetector = new OverscrollDetector(listener);
- mOverscrollDetector.setDirections(true, false);
- }
-
- @Override
- public boolean isReversed() {
- return false;
- }
-
- @Override
- public int getItemCount() {
- return getLoader().getWrappersList().size();
- }
-
- @Override
- public void initAdapter(Context context, InternalLinkMovement.OnLinkClickListener linkListener) {
- mPool = new ImagesPool(context, this);
- mPool.getLoader().addListener(this);
- }
-
- @Override
- public PageLoader getLoader() {
- return mPool.getLoader();
- }
-
- @Override
- public void notifyDataSetChanged() {
- recomputeWidth();
- forceRedraw();
- }
-
- @Override
- public PageWrapper getItem(int position) {
- return mPool.getLoader().getWrappersList().get(position);
- }
-
- @Override
- public void setScaleMode(int scaleMode) {
-
- }
-
- @Override
- public void reload(int position) {
- mPool.getLoader().requestPage(position);
- notifyDataSetChanged();
- }
-
- @Override
- public void setPages(List mangaPages) {
- mPool.recycle();
- mHeights.clear();
- mProgressMap.clear();
- getLoader().setPages(mangaPages);
- scrollToPosition(0);
- }
-
- @Override
- public void finish() {
- getLoader().cancelAll();
- mPool.recycle();
- }
-
- @SuppressLint("ClickableViewAccessibility")
- @Override
- public boolean onTouchEvent(MotionEvent event) {
- if (mOverscrollDetector != null) {
- mOverscrollDetector.onTouch(this, event);
- }
- return super.onTouchEvent(event);
- }
-
- protected Rect computeScrollRange(float scale) {
- Rect range = new Rect(mScrollBounds);
- range.bottom = range.top + (int)(mFullHeight * scale) - getViewportHeight();
- range.right = range.left + (int)(getViewportWidth() * scale) - getViewportWidth();
- return range;
- }
-
- @Override
- public List getPages() {
- List wrappers = mPool.getLoader().getWrappersList();
- ArrayList pages = new ArrayList<>(wrappers.size());
- for (PageWrapper o : wrappers) {
- pages.add(o.page);
- }
- return pages;
- }
-
- @Override
- public void onLoadingStarted(PageWrapper page, boolean shadow) {
-
- }
-
- @Override
- public void onProgressUpdated(PageWrapper page, boolean shadow, int percent) {
- mProgressMap.put(page.position, percent);
- notifyDataSetChanged();
- }
-
- @Override
- public void onLoadingComplete(PageWrapper page, boolean shadow) {
- mProgressMap.put(page.position, 100);
- notifyDataSetChanged();
- }
-
- @Override
- public void onLoadingFail(PageWrapper page, boolean shadow) {
- mProgressMap.put(page.position, -1);
- notifyDataSetChanged();
- }
-
- @Override
- public void onLoadingCancelled(PageWrapper page, boolean shadow) {
- mProgressMap.put(page.position, 0);
- notifyDataSetChanged();
- }
-
- @WorkerThread
- private void notifyPageHeight(int page, int height) {
- Message msg = new Message();
- msg.what = MSG_IMGSIZE;
- msg.arg1 = page;
- msg.arg2 = height;
- mHandler.sendMessage(msg);
- }
-
- @WorkerThread
- private void notifyPageChanged(int page) {
- Message msg = new Message();
- msg.what = MSG_PAGE_CHANGED;
- msg.arg1 = page;
- mHandler.sendMessage(msg);
- }
-
- @Override
- public boolean handleMessage(Message message) {
- switch (message.what) {
- case MSG_IMGSIZE:
- if (!mHeights.containsKey(message.arg1)) {
- mHeights.put(message.arg1, message.arg2);
- recomputeWidth();
- }
- return true;
- case MSG_PAGE_CHANGED:
- int oldPage = mCurrentPage;
- mCurrentPage = message.arg1;
- for (RecyclerViewPager.OnPageChangedListener o : mPageChangeListeners) {
- o.OnPageChanged(oldPage, mCurrentPage);
- }
- return true;
- default:
- return false;
- }
- }
-}
diff --git a/app/src/main/java/org/nv95/openmanga/core/ListWrapper.java b/app/src/main/java/org/nv95/openmanga/core/ListWrapper.java
new file mode 100644
index 00000000..a48b2307
--- /dev/null
+++ b/app/src/main/java/org/nv95/openmanga/core/ListWrapper.java
@@ -0,0 +1,33 @@
+package org.nv95.openmanga.core;
+
+import android.support.annotation.NonNull;
+
+import java.util.ArrayList;
+
+/**
+ * Created by koitharu on 12.01.18.
+ */
+
+public class ListWrapper extends ObjectWrapper> {
+
+ public ListWrapper(ArrayList object) {
+ super(object);
+ }
+
+ public ListWrapper(Throwable error) {
+ super(error);
+ }
+
+ public boolean isEmpty() {
+ return mObject == null || mObject.isEmpty();
+ }
+
+ @NonNull
+ public static ListWrapper badList() {
+ return new ListWrapper<>(new BadResultException());
+ }
+
+ public int size() {
+ return mObject == null ? 0 : mObject.size();
+ }
+}
diff --git a/app/src/main/java/org/nv95/openmanga/core/MangaLocale.java b/app/src/main/java/org/nv95/openmanga/core/MangaLocale.java
new file mode 100644
index 00000000..3ce7c049
--- /dev/null
+++ b/app/src/main/java/org/nv95/openmanga/core/MangaLocale.java
@@ -0,0 +1,23 @@
+package org.nv95.openmanga.core;
+
+import android.support.annotation.IntDef;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+
+/**
+ * Created by koitharu on 26.12.17.
+ */
+
+@Retention(RetentionPolicy.SOURCE)
+@IntDef({MangaLocale.EN, MangaLocale.RU, MangaLocale.JP, MangaLocale.TR, MangaLocale.MULTI, MangaLocale.VIE, MangaLocale.FR})
+public @interface MangaLocale {
+
+ int EN = 0;
+ int RU = 1;
+ int JP = 2;
+ int TR = 3;
+ int MULTI = 4;
+ int VIE = 5;
+ int FR = 6;
+}
diff --git a/app/src/main/java/org/nv95/openmanga/core/MangaStatus.java b/app/src/main/java/org/nv95/openmanga/core/MangaStatus.java
new file mode 100644
index 00000000..a7df8bde
--- /dev/null
+++ b/app/src/main/java/org/nv95/openmanga/core/MangaStatus.java
@@ -0,0 +1,19 @@
+package org.nv95.openmanga.core;
+
+import android.support.annotation.IntDef;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+
+/**
+ * Created by koitharu on 21.12.17.
+ */
+
+@Retention(RetentionPolicy.SOURCE)
+@IntDef({MangaStatus.STATUS_UNKNOWN, MangaStatus.STATUS_COMPLETED, MangaStatus.STATUS_ONGOING})
+public @interface MangaStatus {
+
+ int STATUS_UNKNOWN = 0;
+ int STATUS_COMPLETED = 1;
+ int STATUS_ONGOING = 2;
+}
diff --git a/app/src/main/java/org/nv95/openmanga/core/ObjectWrapper.java b/app/src/main/java/org/nv95/openmanga/core/ObjectWrapper.java
new file mode 100644
index 00000000..fedafa51
--- /dev/null
+++ b/app/src/main/java/org/nv95/openmanga/core/ObjectWrapper.java
@@ -0,0 +1,49 @@
+package org.nv95.openmanga.core;
+
+import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
+
+/**
+ * Created by koitharu on 12.01.18.
+ */
+
+public class ObjectWrapper {
+
+ @Nullable
+ protected final T mObject;
+ @Nullable
+ private final Throwable mThrowable;
+
+ public ObjectWrapper(@NonNull T object) {
+ mObject = object;
+ mThrowable = null;
+ }
+
+ public ObjectWrapper(@NonNull Throwable error) {
+ mObject = null;
+ mThrowable = error;
+ }
+
+ public T get() {
+ return mObject;
+ }
+
+ public Throwable getError() {
+ return mThrowable;
+ }
+
+ public boolean isSuccess() {
+ return mThrowable == null;
+ }
+
+ public boolean isFailed() {
+ return mThrowable != null;
+ }
+
+ public static class BadResultException extends Exception {}
+
+ @NonNull
+ public static ObjectWrapper badObject() {
+ return new ObjectWrapper<>(new BadResultException());
+ }
+}
diff --git a/app/src/main/java/org/nv95/openmanga/core/models/Category.java b/app/src/main/java/org/nv95/openmanga/core/models/Category.java
new file mode 100644
index 00000000..5c0509bf
--- /dev/null
+++ b/app/src/main/java/org/nv95/openmanga/core/models/Category.java
@@ -0,0 +1,53 @@
+package org.nv95.openmanga.core.models;
+
+import android.content.Context;
+import android.os.Bundle;
+import android.support.annotation.NonNull;
+
+import org.nv95.openmanga.R;
+
+/**
+ * Created by koitharu on 26.12.17.
+ */
+
+public class Category {
+
+ public final int id;
+ public final String name;
+ public final long createdAt;
+
+ public Category(int id, String name, long createdAt) {
+ this.id = id;
+ this.name = name;
+ this.createdAt = createdAt;
+ }
+
+ public Category(String name, long createdAt) {
+ this.id = name.hashCode();
+ this.name = name;
+ this.createdAt = createdAt;
+ }
+
+ @NonNull
+ public static Category createDefault(Context context) {
+ return new Category(context.getString(R.string.action_favourites), System.currentTimeMillis());
+ }
+
+ @NonNull
+ public Bundle toBundle() {
+ final Bundle bundle = new Bundle(3);
+ bundle.putInt("id", id);
+ bundle.putString("name", name);
+ bundle.putLong("created_at", createdAt);
+ return bundle;
+ }
+
+ @NonNull
+ public static Category fromBundle(Bundle bundle) {
+ return new Category(
+ bundle.getInt("id"),
+ bundle.getString("name"),
+ bundle.getLong("created_at")
+ );
+ }
+}
diff --git a/app/src/main/java/org/nv95/openmanga/core/models/FileDesc.java b/app/src/main/java/org/nv95/openmanga/core/models/FileDesc.java
new file mode 100644
index 00000000..db961b27
--- /dev/null
+++ b/app/src/main/java/org/nv95/openmanga/core/models/FileDesc.java
@@ -0,0 +1,14 @@
+package org.nv95.openmanga.core.models;
+
+import java.io.File;
+
+public final class FileDesc {
+
+ public final File file;
+ public final int entryCount;
+
+ public FileDesc(File file, int entryCount) {
+ this.file = file;
+ this.entryCount = entryCount;
+ }
+}
diff --git a/app/src/main/java/org/nv95/openmanga/core/models/ListHeader.java b/app/src/main/java/org/nv95/openmanga/core/models/ListHeader.java
new file mode 100644
index 00000000..d1a45fb6
--- /dev/null
+++ b/app/src/main/java/org/nv95/openmanga/core/models/ListHeader.java
@@ -0,0 +1,30 @@
+package org.nv95.openmanga.core.models;
+
+import android.support.annotation.Nullable;
+import android.support.annotation.StringRes;
+
+/**
+ * Created by koitharu on 24.12.17.
+ */
+
+public class ListHeader {
+
+ @StringRes
+ public final int textResId;
+ @Nullable
+ public final String text;
+ @Nullable
+ public final Object extra;
+
+ public ListHeader(@Nullable String text, @Nullable Object extra) {
+ this.text = text;
+ this.textResId = 0;
+ this.extra = extra;
+ }
+
+ public ListHeader(int textResId, @Nullable Object extra) {
+ this.textResId = textResId;
+ this.text = null;
+ this.extra = extra;
+ }
+}
diff --git a/app/src/main/java/org/nv95/openmanga/core/models/MangaBookmark.java b/app/src/main/java/org/nv95/openmanga/core/models/MangaBookmark.java
new file mode 100644
index 00000000..21c98af4
--- /dev/null
+++ b/app/src/main/java/org/nv95/openmanga/core/models/MangaBookmark.java
@@ -0,0 +1,112 @@
+package org.nv95.openmanga.core.models;
+
+import android.os.Bundle;
+import android.os.Parcel;
+import android.os.Parcelable;
+import android.support.annotation.Nullable;
+
+/**
+ * Created by koitharu on 21.12.17.
+ */
+
+public final class MangaBookmark implements Parcelable, UniqueObject {
+
+ public final long id;
+ public final MangaHeader manga;
+ public final long chapterId;
+ public final long pageId;
+ public final long createdAt;
+
+ public MangaBookmark(long id, MangaHeader manga, long chapterId, long pageId, long createdAt) {
+ this.id = id;
+ this.manga = manga;
+ this.chapterId = chapterId;
+ this.pageId = pageId;
+ this.createdAt = createdAt;
+ }
+
+ public MangaBookmark(MangaHeader manga, long chapterId, long pageId, long createdAt) {
+ this.id = pageId + 1; //magic
+ this.manga = manga;
+ this.chapterId = chapterId;
+ this.pageId = pageId;
+ this.createdAt = createdAt;
+ }
+
+ protected MangaBookmark(Parcel in) {
+ id = in.readLong();
+ manga = new MangaHeader(in);
+ chapterId = in.readLong();
+ pageId = in.readLong();
+ createdAt = in.readLong();
+ }
+
+ public static final Creator CREATOR = new Creator() {
+ @Override
+ public MangaBookmark createFromParcel(Parcel in) {
+ return new MangaBookmark(in);
+ }
+
+ @Override
+ public MangaBookmark[] newArray(int size) {
+ return new MangaBookmark[size];
+ }
+ };
+
+ @Override
+ public int describeContents() {
+ return 0;
+ }
+
+ @Override
+ public void writeToParcel(Parcel dest, int flags) {
+ dest.writeLong(id);
+ manga.writeToParcel(dest, flags);
+ dest.writeLong(chapterId);
+ dest.writeLong(pageId);
+ dest.writeLong(createdAt);
+ }
+
+ @Override
+ public long getId() {
+ return id;
+ }
+
+ @Override
+ public boolean equals(Object o) {
+ if (this == o) return true;
+ if (o == null || getClass() != o.getClass()) return false;
+
+ MangaBookmark bookmark = (MangaBookmark) o;
+
+ return id == bookmark.id;
+ }
+
+ @Override
+ public int hashCode() {
+ return (int) (id ^ (id >>> 32));
+ }
+
+ public Bundle toBundle() {
+ final Bundle bundle = new Bundle(5);
+ bundle.putLong("id", id);
+ bundle.putBundle("manga", manga.toBundle());
+ bundle.putLong("chapter_id", chapterId);
+ bundle.putLong("page_id", pageId);
+ bundle.putLong("created_at", createdAt);
+ return bundle;
+ }
+
+ @Nullable
+ public static MangaBookmark from(Bundle bundle) {
+ if (bundle.containsKey("bookmark")) {
+ return bundle.getParcelable("bookmark");
+ } else return new MangaBookmark(
+ bundle.getLong("id"),
+ MangaHeader.from(bundle.getBundle("manga")),
+ bundle.getLong("chapter_id"),
+ bundle.getLong("page_id"),
+ bundle.getLong("created_at")
+ );
+ }
+}
diff --git a/app/src/main/java/org/nv95/openmanga/core/models/MangaChapter.java b/app/src/main/java/org/nv95/openmanga/core/models/MangaChapter.java
new file mode 100644
index 00000000..575962a4
--- /dev/null
+++ b/app/src/main/java/org/nv95/openmanga/core/models/MangaChapter.java
@@ -0,0 +1,104 @@
+package org.nv95.openmanga.core.models;
+
+import android.os.Bundle;
+import android.os.Parcel;
+import android.os.Parcelable;
+
+/**
+ * Created by koitharu on 21.12.17.
+ */
+
+public class MangaChapter implements Parcelable, UniqueObject {
+
+ public static final int FLAG_CHAPTER_SAVED = 1;
+ public static final int FLAG_CHAPTER_NEW = 2;
+
+ public final long id;
+ public final String name;
+ public final int number;
+ public final String url;
+ public final String provider;
+
+ private int mFlags = 0;
+
+ public MangaChapter(String name, int number, String url, String provider) {
+ this.name = name;
+ this.number = number;
+ this.url = url;
+ this.provider = provider;
+ this.id = provider.hashCode() + url.hashCode();
+ }
+
+ public MangaChapter(long id, String name, int number, String url, String provider) {
+ this.id = id;
+ this.name = name;
+ this.number = number;
+ this.url = url;
+ this.provider = provider;
+ }
+
+ protected MangaChapter(Parcel in) {
+ id = in.readLong();
+ name = in.readString();
+ number = in.readInt();
+ url = in.readString();
+ provider = in.readString();
+
+ mFlags = in.readInt();
+ }
+
+ public static final Creator CREATOR = new Creator() {
+ @Override
+ public MangaChapter createFromParcel(Parcel in) {
+ return new MangaChapter(in);
+ }
+
+ @Override
+ public MangaChapter[] newArray(int size) {
+ return new MangaChapter[size];
+ }
+ };
+
+ @Override
+ public int describeContents() {
+ return 0;
+ }
+
+ @Override
+ public void writeToParcel(Parcel dest, int flags) {
+ dest.writeLong(id);
+ dest.writeString(name);
+ dest.writeInt(number);
+ dest.writeString(url);
+ dest.writeString(provider);
+
+ dest.writeInt(mFlags);
+ }
+
+ public Bundle toBundle() {
+ Bundle bundle = new Bundle(1);
+ bundle.putParcelable("_chapter", this);
+ return bundle;
+ }
+
+ public static MangaChapter from(Bundle bundle) {
+ return bundle.getParcelable("_chapter");
+ }
+
+ public boolean isSaved() {
+ return (mFlags & FLAG_CHAPTER_SAVED) != 0;
+ }
+
+ public void addFlag(int flag) {
+ mFlags |= flag;
+ }
+
+ public void removeFlag(int flag) {
+ mFlags &= ~flag;
+ }
+
+ @Override
+ public long getId() {
+ return id;
+ }
+}
diff --git a/app/src/main/java/org/nv95/openmanga/core/models/MangaChaptersList.java b/app/src/main/java/org/nv95/openmanga/core/models/MangaChaptersList.java
new file mode 100644
index 00000000..0f1a57e7
--- /dev/null
+++ b/app/src/main/java/org/nv95/openmanga/core/models/MangaChaptersList.java
@@ -0,0 +1,100 @@
+package org.nv95.openmanga.core.models;
+
+import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
+
+import java.util.ArrayList;
+
+/**
+ * Created by koitharu on 21.12.17.
+ */
+
+public class MangaChaptersList extends ArrayList {
+
+ public static final MangaChaptersList EMPTY_LIST = new MangaChaptersList(0);
+
+ public MangaChaptersList() {
+ }
+
+ public MangaChaptersList(int initialCapacity) {
+ super(initialCapacity);
+ }
+
+ public MangaChaptersList(ArrayList source) {
+ super(source);
+ }
+
+ @Nullable
+ public MangaChapter findItemById(long id) {
+ for (MangaChapter o : this) {
+ if (o != null && o.id == id) {
+ return o;
+ }
+ }
+ return null;
+ }
+
+ @Override
+ public int indexOf(@Nullable Object obj) {
+ if (obj instanceof MangaChapter) {
+ for (int i = 0; i < size(); i++) {
+ if (get(i).id == ((MangaChapter) obj).id) {
+ return i;
+ }
+ }
+ }
+ return -1;
+ }
+
+ @Override
+ public int lastIndexOf(@Nullable Object obj) {
+ if (obj instanceof MangaChapter) {
+ for (int i = size() - 1; i >= 0; i--) {
+ if (get(i).id == ((MangaChapter) obj).id) {
+ return i;
+ }
+ }
+ }
+ return -1;
+ }
+
+ @NonNull
+ public MangaChaptersList subListFrom(MangaChapter from, int count) {
+ int pos = indexOf(from);
+ if (pos == -1) {
+ return EMPTY_LIST;
+ }
+ final MangaChaptersList list = new MangaChaptersList(count + 1);
+ int last = Math.min(size() - 1, pos + count);
+ for (int i = pos; i <= last; i++) {
+ list.add(get(i));
+ }
+ return list;
+ }
+
+ @NonNull
+ public MangaChaptersList subListFrom(MangaChapter from) {
+ int pos = indexOf(from);
+ if (pos == -1) {
+ return EMPTY_LIST;
+ }
+ final MangaChaptersList list = new MangaChaptersList(size() - pos);
+ for (int i = pos; i < size(); i++) {
+ list.add(get(i));
+ }
+ return list;
+ }
+
+ @NonNull
+ public MangaChaptersList subListTo(MangaChapter to) {
+ int pos = indexOf(to);
+ if (pos == -1) {
+ return EMPTY_LIST;
+ }
+ final MangaChaptersList list = new MangaChaptersList(pos + 1);
+ for (int i = 0; i <= pos; i++) {
+ list.add(get(i));
+ }
+ return list;
+ }
+}
diff --git a/app/src/main/java/org/nv95/openmanga/core/models/MangaDetails.java b/app/src/main/java/org/nv95/openmanga/core/models/MangaDetails.java
new file mode 100644
index 00000000..87d6b6ff
--- /dev/null
+++ b/app/src/main/java/org/nv95/openmanga/core/models/MangaDetails.java
@@ -0,0 +1,86 @@
+package org.nv95.openmanga.core.models;
+
+import android.os.Parcel;
+import android.support.annotation.NonNull;
+
+/**
+ * Created by koitharu on 21.12.17.
+ */
+
+public final class MangaDetails extends MangaHeader {
+
+ public final String description;
+ public final String cover;
+ public final String author;
+ @NonNull
+ public final MangaChaptersList chapters;
+
+ public MangaDetails(String name, String summary, String genres, String url, String thumbnail, String provider, int status, short rating, String description, String cover, String author, MangaChaptersList chapters) {
+ super(name, summary, genres, url, thumbnail, provider, status, rating);
+ this.description = description;
+ this.cover = cover;
+ this.author = author;
+ this.chapters = chapters;
+ }
+
+ public MangaDetails(long id, String name, String summary, String genres, String url, String thumbnail, String provider, int status, short rating, String description, String cover, String author, MangaChaptersList chapters) {
+ super(id, name, summary, genres, url, thumbnail, provider, status, rating);
+ this.description = description;
+ this.cover = cover;
+ this.author = author;
+ this.chapters = chapters;
+ }
+
+ public MangaDetails(MangaHeader header, String description, String cover, String author) {
+ super(header.id, header.name, header.summary, header.genres, header.url, header.thumbnail, header.provider, header.status, header.rating);
+ this.description = description;
+ this.cover = cover;
+ this.author = author;
+ this.chapters = new MangaChaptersList();
+ }
+
+ protected MangaDetails(Parcel in) {
+ super(in);
+ description = in.readString();
+ cover = in.readString();
+ author = in.readString();
+ chapters = new MangaChaptersList();
+ in.readTypedList(chapters, MangaChapter.CREATOR);
+ }
+
+ public static final Creator CREATOR = new Creator() {
+ @Override
+ public MangaDetails createFromParcel(Parcel in) {
+ return new MangaDetails(in);
+ }
+
+ @Override
+ public MangaDetails[] newArray(int size) {
+ return new MangaDetails[size];
+ }
+ };
+
+ @Override
+ public int describeContents() {
+ return 0;
+ }
+
+ @Override
+ public void writeToParcel(Parcel parcel, int i) {
+ super.writeToParcel(parcel, i);
+ parcel.writeString(description);
+ parcel.writeString(cover);
+ parcel.writeString(author);
+ parcel.writeTypedList(chapters);
+ }
+
+ @NonNull
+ public static MangaDetails from(SavedManga manga) {
+ return new MangaDetails(
+ manga,
+ manga.description,
+ manga.thumbnail,
+ manga.author
+ );
+ }
+}
diff --git a/app/src/main/java/org/nv95/openmanga/core/models/MangaFavourite.java b/app/src/main/java/org/nv95/openmanga/core/models/MangaFavourite.java
new file mode 100644
index 00000000..d4a6230d
--- /dev/null
+++ b/app/src/main/java/org/nv95/openmanga/core/models/MangaFavourite.java
@@ -0,0 +1,40 @@
+package org.nv95.openmanga.core.models;
+
+/**
+ * Created by koitharu on 26.12.17.
+ */
+
+public final class MangaFavourite extends MangaHeader {
+
+ public final long createdAt;
+ public final int categoryId;
+ public final int totalChapters;
+ public final int newChapters;
+
+ public MangaFavourite(long id, String name, String summary, String genres, String url, String thumbnail, String provider, int status, short rating, long createdAt, int categoryId, int totalChapters, int newChapters) {
+ super(id, name, summary, genres, url, thumbnail, provider, status, rating);
+ this.createdAt = createdAt;
+ this.categoryId = categoryId;
+ this.totalChapters = totalChapters;
+ this.newChapters = newChapters;
+ }
+
+
+ public static MangaFavourite from(MangaHeader mangaHeader, int categoryId, int totalChapters) {
+ return new MangaFavourite(
+ mangaHeader.id,
+ mangaHeader.name,
+ mangaHeader.summary,
+ mangaHeader.genres,
+ mangaHeader.url,
+ mangaHeader.thumbnail,
+ mangaHeader.provider,
+ mangaHeader.status,
+ mangaHeader.rating,
+ System.currentTimeMillis(),
+ categoryId,
+ totalChapters,
+ 0
+ );
+ }
+}
diff --git a/app/src/main/java/org/nv95/openmanga/core/models/MangaGenre.java b/app/src/main/java/org/nv95/openmanga/core/models/MangaGenre.java
new file mode 100644
index 00000000..76232879
--- /dev/null
+++ b/app/src/main/java/org/nv95/openmanga/core/models/MangaGenre.java
@@ -0,0 +1,96 @@
+package org.nv95.openmanga.core.models;
+
+import android.content.Context;
+import android.os.Parcel;
+import android.os.Parcelable;
+import android.support.annotation.NonNull;
+import android.support.annotation.StringRes;
+
+/**
+ * Created by koitharu on 21.12.17.
+ */
+
+public final class MangaGenre implements Parcelable {
+
+ @StringRes
+ public final int nameId;
+ @NonNull
+ public final String value;
+
+ public MangaGenre(int nameId, @NonNull String value) {
+ this.nameId = nameId;
+ this.value = value;
+ }
+
+ private MangaGenre(Parcel in) {
+ nameId = in.readInt();
+ value = in.readString();
+ }
+
+ public static final Creator CREATOR = new Creator() {
+ @Override
+ public MangaGenre createFromParcel(Parcel in) {
+ return new MangaGenre(in);
+ }
+
+ @Override
+ public MangaGenre[] newArray(int size) {
+ return new MangaGenre[size];
+ }
+ };
+
+ @Override
+ public String toString() {
+ return value;
+ }
+
+ @Override
+ public int describeContents() {
+ return 0;
+ }
+
+ @Override
+ public void writeToParcel(Parcel parcel, int i) {
+ parcel.writeInt(nameId);
+ parcel.writeString(value);
+ }
+
+ @Override
+ public boolean equals(Object o) {
+ if (this == o) return true;
+ if (o == null || getClass() != o.getClass()) return false;
+
+ MangaGenre that = (MangaGenre) o;
+
+ return nameId == that.nameId && value.equals(that.value);
+ }
+
+ @Override
+ public int hashCode() {
+ return 31 * nameId + value.hashCode();
+ }
+
+ @NonNull
+ public static String joinNames(@NonNull Context context, @NonNull MangaGenre[] genres, @NonNull String delimiter) {
+ final StringBuilder builder = new StringBuilder();
+ boolean nonFirst = false;
+ for (MangaGenre o: genres) {
+ if (nonFirst) {
+ builder.append(delimiter);
+ } else {
+ nonFirst = true;
+ }
+ builder.append(context.getString(o.nameId));
+ }
+ return builder.toString();
+ }
+
+ public static int indexOf(MangaGenre[] array, @NonNull String value) {
+ for (int i = 0; i < array.length; i++) {
+ if (value.equalsIgnoreCase(array[i].value)) {
+ return i;
+ }
+ }
+ return -1;
+ }
+}
diff --git a/app/src/main/java/org/nv95/openmanga/core/models/MangaHeader.java b/app/src/main/java/org/nv95/openmanga/core/models/MangaHeader.java
new file mode 100644
index 00000000..86655316
--- /dev/null
+++ b/app/src/main/java/org/nv95/openmanga/core/models/MangaHeader.java
@@ -0,0 +1,146 @@
+package org.nv95.openmanga.core.models;
+
+import android.os.Bundle;
+import android.os.Parcel;
+import android.os.Parcelable;
+import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
+
+import org.nv95.openmanga.core.MangaStatus;
+
+/**
+ * Created by koitharu on 21.12.17.
+ */
+
+public class MangaHeader implements Parcelable, UniqueObject {
+
+ public final long id;
+ public final String name;
+ public final String summary;
+ public final String genres;
+ public final String url;
+ public final String thumbnail;
+ public final String provider;
+ @MangaStatus
+ public final int status;
+ public final short rating; //0..100
+
+ public MangaHeader(String name, String summary, String genres, String url, String thumbnail, String provider, @MangaStatus int status, short rating) {
+ this.name = name;
+ this.summary = summary;
+ this.genres = genres;
+ this.url = url;
+ this.thumbnail = thumbnail;
+ this.provider = provider;
+ this.status = status;
+ this.rating = rating;
+ this.id = provider.hashCode() + url.hashCode();
+ }
+
+ public MangaHeader(long id, String name, String summary, String genres, String url, String thumbnail, String provider, @MangaStatus int status, short rating) {
+ this.id = id;
+ this.name = name;
+ this.summary = summary;
+ this.genres = genres;
+ this.url = url;
+ this.thumbnail = thumbnail;
+ this.provider = provider;
+ this.status = status;
+ this.rating = rating;
+ }
+
+
+ protected MangaHeader(Parcel in) {
+ id = in.readLong();
+ name = in.readString();
+ summary = in.readString();
+ genres = in.readString();
+ url = in.readString();
+ thumbnail = in.readString();
+ provider = in.readString();
+ status = in.readInt();
+ rating = (short) in.readInt();
+ }
+
+ public static final Creator CREATOR = new Creator() {
+ @Override
+ public MangaHeader createFromParcel(Parcel in) {
+ return new MangaHeader(in);
+ }
+
+ @Override
+ public MangaHeader[] newArray(int size) {
+ return new MangaHeader[size];
+ }
+ };
+
+ @Override
+ public int describeContents() {
+ return 0;
+ }
+
+ @Override
+ public void writeToParcel(Parcel parcel, int i) {
+ parcel.writeLong(id);
+ parcel.writeString(name);
+ parcel.writeString(summary);
+ parcel.writeString(genres);
+ parcel.writeString(url);
+ parcel.writeString(thumbnail);
+ parcel.writeString(provider);
+ parcel.writeInt(status);
+ parcel.writeInt((int) rating);
+ }
+
+ @NonNull
+ public static MangaHeader from(MangaHeader other) {
+ return new MangaHeader(
+ other.id,
+ other.name,
+ other.summary,
+ other.genres,
+ other.url,
+ other.thumbnail,
+ other.provider,
+ other.status,
+ other.rating
+ );
+ }
+
+ @Nullable
+ public static MangaHeader from(Bundle bundle) {
+ if (bundle.containsKey("manga")) {
+ return bundle.getParcelable("manga");
+ } else return new MangaHeader(
+ bundle.getLong("id"),
+ bundle.getString("name"),
+ bundle.getString("summary"),
+ bundle.getString("genres"),
+ bundle.getString("url"),
+ bundle.getString("thumbnail"),
+ bundle.getString("provider"),
+ bundle.getInt("status"),
+ (short) bundle.getInt("rating")
+ );
+ }
+
+ @NonNull
+ public Bundle toBundle() {
+ final Bundle bundle = new Bundle();
+ bundle.putLong("id", id);
+ bundle.putString("name", name);
+ bundle.putString("summary", summary);
+ bundle.putString("genres", genres);
+ bundle.putString("url", url);
+ bundle.putString("thumbnail", thumbnail);
+ bundle.putString("provider", provider);
+ bundle.putInt("status", status);
+ bundle.putInt("rating", rating);
+ return bundle;
+ }
+
+ @Override
+ public long getId() {
+ return id;
+ }
+}
diff --git a/app/src/main/java/org/nv95/openmanga/core/models/MangaHistory.java b/app/src/main/java/org/nv95/openmanga/core/models/MangaHistory.java
new file mode 100644
index 00000000..7608adbd
--- /dev/null
+++ b/app/src/main/java/org/nv95/openmanga/core/models/MangaHistory.java
@@ -0,0 +1,42 @@
+package org.nv95.openmanga.core.models;
+
+/**
+ * Created by koitharu on 24.12.17.
+ */
+
+public final class MangaHistory extends MangaHeader {
+
+ public final long chapterId;
+ public final long pageId;
+ public final long updatedAt;
+ public final short readerPreset;
+ public final int totalChapters;
+
+ public MangaHistory(String name, String summary, String genres, String url, String thumbnail, String provider, int status, short rating, long chapterId, long pageId, long updatedAt, short readerPreset, int totalChapters) {
+ super(name, summary, genres, url, thumbnail, provider, status, rating);
+ this.chapterId = chapterId;
+ this.pageId = pageId;
+ this.updatedAt = updatedAt;
+ this.readerPreset = readerPreset;
+ this.totalChapters = totalChapters;
+ }
+
+ public MangaHistory(long id, String name, String summary, String genres, String url, String thumbnail, String provider, int status, short rating, long chapterId, long pageId, long updatedAt, short readerPreset, int totalChapters) {
+ super(id, name, summary, genres, url, thumbnail, provider, status, rating);
+ this.chapterId = chapterId;
+ this.pageId = pageId;
+ this.updatedAt = updatedAt;
+ this.readerPreset = readerPreset;
+ this.totalChapters = totalChapters;
+ }
+
+ public MangaHistory(MangaHeader header, MangaChapter chapter, int totalChapters, MangaPage page, short readerPreset) {
+ super(header.id, header.name, header.summary, header.genres, header.url, header.thumbnail, header.provider, header.status, header.rating);
+ this.chapterId = chapter.id;
+ this.totalChapters = totalChapters;
+ this.pageId = page.id;
+ updatedAt = System.currentTimeMillis();
+ this.readerPreset = readerPreset;
+
+ }
+}
diff --git a/app/src/main/java/org/nv95/openmanga/core/models/MangaPage.java b/app/src/main/java/org/nv95/openmanga/core/models/MangaPage.java
new file mode 100644
index 00000000..fddd38ac
--- /dev/null
+++ b/app/src/main/java/org/nv95/openmanga/core/models/MangaPage.java
@@ -0,0 +1,65 @@
+package org.nv95.openmanga.core.models;
+
+import android.os.Parcel;
+import android.os.Parcelable;
+import android.support.annotation.NonNull;
+
+/**
+ * Created by koitharu on 21.12.17.
+ */
+
+public class MangaPage implements Parcelable, UniqueObject {
+
+ public final long id;
+ @NonNull
+ public final String url;
+ public final String provider;
+
+ public MangaPage(String url, String provider) {
+ this.url = url;
+ this.provider = provider;
+ this.id = provider.hashCode() + url.hashCode();
+ }
+
+ public MangaPage(long id, @NonNull String url, String provider) {
+ this.id = id;
+ this.url = url;
+ this.provider = provider;
+ }
+
+ @SuppressWarnings("ConstantConditions")
+ protected MangaPage(Parcel in) {
+ id = in.readLong();
+ url = in.readString();
+ provider = in.readString();
+ }
+
+ public static final Creator CREATOR = new Creator() {
+ @Override
+ public MangaPage createFromParcel(Parcel in) {
+ return new MangaPage(in);
+ }
+
+ @Override
+ public MangaPage[] newArray(int size) {
+ return new MangaPage[size];
+ }
+ };
+
+ @Override
+ public int describeContents() {
+ return 0;
+ }
+
+ @Override
+ public void writeToParcel(Parcel dest, int flags) {
+ dest.writeLong(id);
+ dest.writeString(url);
+ dest.writeString(provider);
+ }
+
+ @Override
+ public long getId() {
+ return id;
+ }
+}
diff --git a/app/src/main/java/org/nv95/openmanga/core/models/MangaRecommendation.java b/app/src/main/java/org/nv95/openmanga/core/models/MangaRecommendation.java
new file mode 100644
index 00000000..0105fed7
--- /dev/null
+++ b/app/src/main/java/org/nv95/openmanga/core/models/MangaRecommendation.java
@@ -0,0 +1,43 @@
+package org.nv95.openmanga.core.models;
+
+import android.os.Parcel;
+
+/**
+ * Created by koitharu on 29.01.18.
+ */
+
+public final class MangaRecommendation extends MangaHeader {
+
+ public final int category;
+
+ public MangaRecommendation(long id, String name, String summary, String genres, String url, String thumbnail, String provider, int status, short rating, int category) {
+ super(id, name, summary, genres, url, thumbnail, provider, status, rating);
+ this.category = category;
+ }
+
+ protected MangaRecommendation(Parcel in) {
+ super(in);
+ category = in.readInt();
+ }
+
+ public MangaRecommendation(MangaHeader mangaHeader, int category) {
+ this(
+ mangaHeader.id,
+ mangaHeader.name,
+ mangaHeader.summary,
+ mangaHeader.genres,
+ mangaHeader.url,
+ mangaHeader.thumbnail,
+ mangaHeader.provider,
+ mangaHeader.status,
+ mangaHeader.rating,
+ category
+ );
+ }
+
+ @Override
+ public void writeToParcel(Parcel parcel, int i) {
+ super.writeToParcel(parcel, i);
+ parcel.writeInt(category);
+ }
+}
diff --git a/app/src/main/java/org/nv95/openmanga/core/models/MangaUpdateInfo.java b/app/src/main/java/org/nv95/openmanga/core/models/MangaUpdateInfo.java
new file mode 100644
index 00000000..b3178be4
--- /dev/null
+++ b/app/src/main/java/org/nv95/openmanga/core/models/MangaUpdateInfo.java
@@ -0,0 +1,23 @@
+package org.nv95.openmanga.core.models;
+
+/**
+ * Created by koitharu on 30.01.18.
+ */
+
+public final class MangaUpdateInfo implements UniqueObject {
+
+ public final long mangaId;
+ public final String mangaName;
+ public final int newChapters;
+
+ public MangaUpdateInfo(long mangaId, String mangaName, int newChapters) {
+ this.mangaId = mangaId;
+ this.mangaName = mangaName;
+ this.newChapters = newChapters;
+ }
+
+ @Override
+ public long getId() {
+ return mangaId;
+ }
+}
diff --git a/app/src/main/java/org/nv95/openmanga/core/models/ProviderHeader.java b/app/src/main/java/org/nv95/openmanga/core/models/ProviderHeader.java
new file mode 100644
index 00000000..476c33a8
--- /dev/null
+++ b/app/src/main/java/org/nv95/openmanga/core/models/ProviderHeader.java
@@ -0,0 +1,30 @@
+package org.nv95.openmanga.core.models;
+
+import android.support.annotation.NonNull;
+
+/**
+ * Created by koitharu on 26.12.17.
+ */
+
+public class ProviderHeader {
+
+ @NonNull
+ public final String cName;
+ @NonNull
+ public final String dName;
+
+ public ProviderHeader(@NonNull String cName, @NonNull String dName) {
+ this.cName = cName;
+ this.dName = dName;
+ }
+
+ @Override
+ public boolean equals(Object obj) {
+ return obj != null && obj instanceof ProviderHeader && ((ProviderHeader) obj).cName.equals(cName);
+ }
+
+ @Override
+ public int hashCode() {
+ return cName.hashCode();
+ }
+}
diff --git a/app/src/main/java/org/nv95/openmanga/core/models/SavedChapter.java b/app/src/main/java/org/nv95/openmanga/core/models/SavedChapter.java
new file mode 100644
index 00000000..c7f234f0
--- /dev/null
+++ b/app/src/main/java/org/nv95/openmanga/core/models/SavedChapter.java
@@ -0,0 +1,34 @@
+package org.nv95.openmanga.core.models;
+
+import android.support.annotation.NonNull;
+
+/**
+ * Created by koitharu on 25.01.18.
+ */
+
+public class SavedChapter extends MangaChapter {
+
+ public final long mangaId;
+
+ public SavedChapter(String name, int number, String url, String provider, long mangaId) {
+ super(name, number, url, provider);
+ this.mangaId = mangaId;
+ }
+
+ public SavedChapter(long id, String name, int number, String url, String provider, long mangaId) {
+ super(id, name, number, url, provider);
+ this.mangaId = mangaId;
+ }
+
+ @NonNull
+ public static SavedChapter from(MangaChapter chapter, long mangaId) {
+ return new SavedChapter(
+ chapter.id,
+ chapter.name,
+ chapter.number,
+ chapter.url,
+ chapter.provider,
+ mangaId
+ );
+ }
+}
diff --git a/app/src/main/java/org/nv95/openmanga/core/models/SavedManga.java b/app/src/main/java/org/nv95/openmanga/core/models/SavedManga.java
new file mode 100644
index 00000000..deae8829
--- /dev/null
+++ b/app/src/main/java/org/nv95/openmanga/core/models/SavedManga.java
@@ -0,0 +1,88 @@
+package org.nv95.openmanga.core.models;
+
+import android.os.Parcel;
+import android.os.Parcelable;
+import android.support.annotation.NonNull;
+
+import java.io.File;
+
+/**
+ * Created by koitharu on 23.01.18.
+ */
+
+public final class SavedManga extends MangaHeader implements Parcelable {
+
+ public final long createdAt;
+ public final String localPath;
+ public final String description;
+ public final String author;
+
+ public SavedManga(String name, String summary, String genres, String url, String thumbnail, String provider, int status, short rating, long createdAt, String localPath, String description, String author) {
+ super(name, summary, genres, url, thumbnail, provider, status, rating);
+ this.createdAt = createdAt;
+ this.localPath = localPath;
+ this.description = description;
+ this.author = author;
+ }
+
+ public SavedManga(long id, String name, String summary, String genres, String url, String thumbnail, String provider, int status, short rating, long createdAt, String localPath, String description, String author) {
+ super(id, name, summary, genres, url, thumbnail, provider, status, rating);
+ this.createdAt = createdAt;
+ this.localPath = localPath;
+ this.description = description;
+ this.author = author;
+ }
+
+ public static final Creator CREATOR = new Creator() {
+ @Override
+ public SavedManga createFromParcel(Parcel in) {
+ return new SavedManga(in);
+ }
+
+ @Override
+ public SavedManga[] newArray(int size) {
+ return new SavedManga[size];
+ }
+ };
+
+ @Override
+ public int describeContents() {
+ return 0;
+ }
+
+ @Override
+ public void writeToParcel(Parcel parcel, int i) {
+ super.writeToParcel(parcel, i);
+ parcel.writeLong(createdAt);
+ parcel.writeString(localPath);
+ parcel.writeString(description);
+ parcel.writeString(author);
+ }
+
+ protected SavedManga(Parcel in) {
+ super(in);
+ createdAt = in.readLong();
+ localPath = in.readString();
+ description = in.readString();
+ author = in.readString();
+ }
+
+ @NonNull
+ public static SavedManga from(@NonNull MangaDetails other, @NonNull File localPath) {
+ return new SavedManga(
+ other.id,
+ other.name,
+ other.summary,
+ other.genres,
+ other.url,
+ other.thumbnail,
+ other.provider,
+ other.status,
+ other.rating,
+ System.currentTimeMillis(),
+ localPath.getPath(),
+ other.description,
+ other.author
+ );
+ }
+}
diff --git a/app/src/main/java/org/nv95/openmanga/core/models/SavedPage.java b/app/src/main/java/org/nv95/openmanga/core/models/SavedPage.java
new file mode 100644
index 00000000..91a02b08
--- /dev/null
+++ b/app/src/main/java/org/nv95/openmanga/core/models/SavedPage.java
@@ -0,0 +1,36 @@
+package org.nv95.openmanga.core.models;
+
+import android.support.annotation.NonNull;
+
+/**
+ * Created by koitharu on 25.01.18.
+ */
+
+public class SavedPage extends MangaPage {
+
+ public final long chapterId;
+ public final int number;
+
+ public SavedPage(String url, String provider, long chapterId, int number) {
+ super(url, provider);
+ this.chapterId = chapterId;
+ this.number = number;
+ }
+
+ public SavedPage(long id, String url, String provider, long chapterId, int number) {
+ super(id, url, provider);
+ this.chapterId = chapterId;
+ this.number = number;
+ }
+
+ @NonNull
+ public static SavedPage from(MangaPage page, long chapterId, int number) {
+ return new SavedPage(
+ page.id,
+ page.url,
+ page.provider,
+ chapterId,
+ number
+ );
+ }
+}
diff --git a/app/src/main/java/org/nv95/openmanga/core/models/TypedString.java b/app/src/main/java/org/nv95/openmanga/core/models/TypedString.java
new file mode 100644
index 00000000..944f0a9e
--- /dev/null
+++ b/app/src/main/java/org/nv95/openmanga/core/models/TypedString.java
@@ -0,0 +1,40 @@
+package org.nv95.openmanga.core.models;
+
+import android.content.Context;
+import android.support.annotation.NonNull;
+import android.support.annotation.StringRes;
+
+public final class TypedString {
+
+ @StringRes
+ private final int mStringResId;
+ private final String mString;
+ private final int mType;
+ private final int mSubPos;
+
+ public TypedString(@NonNull Context context, @StringRes int stringResId, int type, int subPos) {
+ mStringResId = stringResId;
+ mString = context.getString(stringResId);
+ mType = type;
+ mSubPos = subPos;
+ }
+
+ public int getType() {
+ return mType;
+ }
+
+ public int getSubPosition() {
+ return mSubPos;
+ }
+
+ @NonNull
+ @Override
+ public String toString() {
+ return mString;
+ }
+
+ @Override
+ public int hashCode() {
+ return mStringResId;
+ }
+}
\ No newline at end of file
diff --git a/app/src/main/java/org/nv95/openmanga/core/models/UniqueObject.java b/app/src/main/java/org/nv95/openmanga/core/models/UniqueObject.java
new file mode 100644
index 00000000..26e1a037
--- /dev/null
+++ b/app/src/main/java/org/nv95/openmanga/core/models/UniqueObject.java
@@ -0,0 +1,10 @@
+package org.nv95.openmanga.core.models;
+
+/**
+ * Created by koitharu on 29.01.18.
+ */
+
+public interface UniqueObject {
+
+ long getId();
+}
diff --git a/app/src/main/java/org/nv95/openmanga/core/models/UserTip.java b/app/src/main/java/org/nv95/openmanga/core/models/UserTip.java
new file mode 100644
index 00000000..92a8073c
--- /dev/null
+++ b/app/src/main/java/org/nv95/openmanga/core/models/UserTip.java
@@ -0,0 +1,70 @@
+package org.nv95.openmanga.core.models;
+
+import android.support.annotation.DrawableRes;
+import android.support.annotation.IdRes;
+import android.support.annotation.StringRes;
+
+/**
+ * Created by koitharu on 12.01.18.
+ */
+
+public final class UserTip {
+
+ public static final int FLAG_NO_DISMISSIBLE = 1;
+ public static final int FLAG_DISMISS_BUTTON = 2;
+
+ public final String title;
+ public final String content;
+ @DrawableRes
+ public final int icon;
+ @StringRes
+ public final int actionText;
+ @IdRes
+ public final int actionId;
+ private int mFlags = 0;
+
+ public UserTip(String title, String content) {
+ this.title = title;
+ this.content = content;
+ this.icon = 0;
+ this.actionText = 0;
+ this.actionId = 0;
+ }
+
+ public UserTip(String title, String content, @DrawableRes int icon) {
+ this.title = title;
+ this.content = content;
+ this.icon = icon;
+ this.actionText = 0;
+ this.actionId = 0;
+ }
+
+ public UserTip(String title, String content, @DrawableRes int icon, @StringRes int actionText, @IdRes int actionId) {
+ this.title = title;
+ this.content = content;
+ this.icon = icon;
+ this.actionText = actionText;
+ this.actionId = actionId;
+ }
+
+ public UserTip addFlag(int flag) {
+ mFlags |= flag;
+ return this;
+ }
+
+ public boolean isDismissible() {
+ return (mFlags & FLAG_NO_DISMISSIBLE) == 0;
+ }
+
+ public boolean hasDismissButton() {
+ return (mFlags & FLAG_DISMISS_BUTTON) != 0;
+ }
+
+ public boolean hasIcon() {
+ return icon != 0;
+ }
+
+ public boolean hasAction() {
+ return actionText != 0 && actionId != 0;
+ }
+}
diff --git a/app/src/main/java/org/nv95/openmanga/core/providers/CName.java b/app/src/main/java/org/nv95/openmanga/core/providers/CName.java
new file mode 100644
index 00000000..4548aceb
--- /dev/null
+++ b/app/src/main/java/org/nv95/openmanga/core/providers/CName.java
@@ -0,0 +1,21 @@
+package org.nv95.openmanga.core.providers;
+
+import android.support.annotation.StringDef;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+
+/**
+ * Created by koitharu on 11.01.18.
+ */
+
+@Retention(RetentionPolicy.SOURCE)
+@StringDef({
+ DesumeProvider.CNAME,
+ ExhentaiProvider.CNAME,
+ ReadmangaruProvider.CNAME,
+ MintmangaProvider.CNAME,
+ SelfmangaProvider.CNAME
+})
+public @interface CName {
+}
diff --git a/app/src/main/java/org/nv95/openmanga/core/providers/DesumeProvider.java b/app/src/main/java/org/nv95/openmanga/core/providers/DesumeProvider.java
new file mode 100644
index 00000000..3e3fe19b
--- /dev/null
+++ b/app/src/main/java/org/nv95/openmanga/core/providers/DesumeProvider.java
@@ -0,0 +1,176 @@
+package org.nv95.openmanga.core.providers;
+
+import android.annotation.SuppressLint;
+import android.content.Context;
+import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
+import android.text.TextUtils;
+
+import org.json.JSONArray;
+import org.json.JSONObject;
+import org.nv95.openmanga.R;
+import org.nv95.openmanga.common.utils.network.NetworkUtils;
+import org.nv95.openmanga.core.MangaStatus;
+import org.nv95.openmanga.core.models.MangaChapter;
+import org.nv95.openmanga.core.models.MangaDetails;
+import org.nv95.openmanga.core.models.MangaGenre;
+import org.nv95.openmanga.core.models.MangaHeader;
+import org.nv95.openmanga.core.models.MangaPage;
+
+import java.util.ArrayList;
+
+/**
+ * Created by koitharu on 21.12.17.
+ */
+@SuppressLint("DefaultLocale")
+public final class DesumeProvider extends MangaProvider {
+
+ public static final String CNAME = "network/desu.me";
+ public static final String DNAME = "DesuMe";
+
+ private final int[] mSorts = new int[] {
+ R.string.sort_alphabetical,
+ R.string.sort_popular,
+ R.string.sort_updated
+ };
+
+ private final String[] mSortValues = new String[] {
+ "name",
+ "popular",
+ ""
+ };
+
+ private final MangaGenre[] mGenres = new MangaGenre[]{
+ new MangaGenre(R.string.genre_action, "action"),
+ new MangaGenre(R.string.genre_martialarts, "martial%20arts"),
+ new MangaGenre(R.string.genre_vampires, "vampire"),
+ new MangaGenre(R.string.web, "manhwa"),
+ new MangaGenre(R.string.genre_military, "military"),
+ new MangaGenre(R.string.genre_harem, "harem"),
+ new MangaGenre(R.string.genre_youkai, "demons"),
+ new MangaGenre(R.string.genre_drama, "drama"),
+ new MangaGenre(R.string.genre_josei, "josei"),
+ new MangaGenre(R.string.genre_game, "game"),
+ new MangaGenre(R.string.genre_historical, "historical"),
+ new MangaGenre(R.string.genre_comedy, "comedy"),
+ new MangaGenre(R.string.genre_magic, "magic"),
+ new MangaGenre(R.string.genre_mecha, "mecha"),
+ new MangaGenre(R.string.genre_mystery, "mystery"),
+ new MangaGenre(R.string.genre_music, "music"),
+ new MangaGenre(R.string.genre_sci_fi, "sci-fi"),
+ new MangaGenre(R.string.genre_parodi, "parody"),
+ new MangaGenre(R.string.genre_slice_of_life, "slice%20of%20life"),
+ new MangaGenre(R.string.genre_police, "police"),
+ new MangaGenre(R.string.genre_adventure, "adventure"),
+ new MangaGenre(R.string.genre_psychological, "psychological"),
+ new MangaGenre(R.string.genre_romance, "romance"),
+ new MangaGenre(R.string.genre_samurai, "samurai"),
+ new MangaGenre(R.string.genre_supernatural, "supernatural"),
+ new MangaGenre(R.string.genre_genderbender, "gender%20bender"),
+ new MangaGenre(R.string.genre_sports, "sports"),
+ new MangaGenre(R.string.genre_superpower, "super%20power"),
+ new MangaGenre(R.string.genre_seinen, "seinen"),
+ new MangaGenre(R.string.genre_shoujo, "shoujo"),
+ new MangaGenre(R.string.genre_shounen, "shounen"),
+ new MangaGenre(R.string.genre_shounen_ai, "shounen%20ai"),
+ new MangaGenre(R.string.genre_thriller, "thriller"),
+ new MangaGenre(R.string.genre_horror, "horror"),
+ new MangaGenre(R.string.genre_fantasy, "fantasy"),
+ new MangaGenre(R.string.genre_hentai, "hentai"),
+ new MangaGenre(R.string.genre_school, "school"),
+ new MangaGenre(R.string.genre_ecchi, "ecchi"),
+ new MangaGenre(R.string.genre_yuri, "yuri"),
+ new MangaGenre(R.string.genre_yaoi, "yaoi")
+ };
+
+ public DesumeProvider(Context context) {
+ super(context);
+ }
+
+ @NonNull
+ @Override
+ public ArrayList query(@Nullable String search, int page, int sortOrder, @NonNull String[] genres) throws Exception {
+ String url = String.format(
+ "http://desu.me/manga/api/?limit=20&order_by=%s&page=%d&genres=%s&search=%s",
+ sortOrder == -1 ? "popular" : mSortValues[sortOrder],
+ page + 1,
+ TextUtils.join(",", genres),
+ search == null ? "" : search
+ );
+ JSONArray ja = NetworkUtils.getJSONObject(url).getJSONArray("response");
+ ArrayList list = new ArrayList<>(ja.length());
+ for (int i = 0; i < ja.length(); i++) {
+ JSONObject jo = ja.getJSONObject(i);
+ int status = MangaStatus.STATUS_UNKNOWN;
+ switch (jo.getString("status")) {
+ case "released":
+ status = MangaStatus.STATUS_COMPLETED;
+ break;
+ case "ongoing":
+ status = MangaStatus.STATUS_ONGOING;
+ break;
+ }
+ list.add(new MangaHeader(
+ jo.getString("name"),
+ jo.getString("russian"),
+ jo.getString("genres"),
+ "http://desu.me/manga/api/" + jo.getInt("id"),
+ jo.getJSONObject("image").getString("x225"),
+ CNAME,
+ status,
+ (byte) (jo.getDouble("score") * 10)
+ ));
+ }
+ return list;
+ }
+
+ @NonNull
+ @Override
+ public MangaDetails getDetails(MangaHeader header) throws Exception {
+ JSONObject jo = NetworkUtils.getJSONObject(header.url).getJSONObject("response");
+ MangaDetails details = new MangaDetails(
+ header,
+ jo.getString("description"),
+ jo.getJSONObject("image").getString("original"),
+ "" //not supported by desu.me
+ );
+ JSONArray ja = jo.getJSONObject("chapters").getJSONArray("list");
+ final int total = ja.length();
+ for (int i = 0; i < total; i++) {
+ JSONObject chapter = ja.getJSONObject(i);
+ details.chapters.add(0, new MangaChapter(
+ chapter.isNull("title") ? "Chapter " + (total - i) : chapter.getString("title"),
+ i,
+ details.url + "/chapter/" + chapter.getInt("id"),
+ CNAME
+ ));
+ }
+ return details;
+ }
+
+ @NonNull
+ @Override
+ public ArrayList getPages(String chapterUrl) throws Exception {
+ JSONObject jo = NetworkUtils.getJSONObject(chapterUrl).getJSONObject("response");
+ JSONArray ja = jo.getJSONObject("pages").getJSONArray("list");
+ ArrayList pages = new ArrayList<>(ja.length());
+ for (int i = 0; i < ja.length(); i++) {
+ jo = ja.getJSONObject(i);
+ pages.add(new MangaPage(
+ jo.getString("img"),
+ CNAME
+ ));
+ }
+ return pages;
+ }
+
+ @Override
+ public MangaGenre[] getAvailableGenres() {
+ return mGenres;
+ }
+
+ @Override
+ public int[] getAvailableSortOrders() {
+ return mSorts;
+ }
+}
diff --git a/app/src/main/java/org/nv95/openmanga/core/providers/ExhentaiProvider.java b/app/src/main/java/org/nv95/openmanga/core/providers/ExhentaiProvider.java
new file mode 100644
index 00000000..5bfd5d2f
--- /dev/null
+++ b/app/src/main/java/org/nv95/openmanga/core/providers/ExhentaiProvider.java
@@ -0,0 +1,284 @@
+package org.nv95.openmanga.core.providers;
+
+import android.annotation.SuppressLint;
+import android.content.Context;
+import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
+
+import org.jsoup.nodes.Document;
+import org.jsoup.nodes.Element;
+import org.jsoup.select.Elements;
+import org.nv95.openmanga.R;
+import org.nv95.openmanga.common.StringJoinerCompat;
+import org.nv95.openmanga.common.utils.network.CookieStore;
+import org.nv95.openmanga.common.utils.network.NetworkUtils;
+import org.nv95.openmanga.core.MangaStatus;
+import org.nv95.openmanga.core.models.MangaChapter;
+import org.nv95.openmanga.core.models.MangaDetails;
+import org.nv95.openmanga.core.models.MangaGenre;
+import org.nv95.openmanga.core.models.MangaHeader;
+import org.nv95.openmanga.core.models.MangaPage;
+
+import java.util.ArrayList;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+/**
+ * Created by koitharu on 12.01.18.
+ */
+
+public final class ExhentaiProvider extends MangaProvider {
+
+ public static final String CNAME = "network/exhentai";
+ public static final String DNAME = "ExHentai";
+
+ private static final String COOKIE_DEFAULT = "sl=dm_1; nw=1; uconfig=dm_t; igneous=0";
+
+ static {
+ CookieStore.getInstance().put("e-hentai.org", COOKIE_DEFAULT);
+ CookieStore.getInstance().put("exhentai.org", COOKIE_DEFAULT);
+ }
+
+ private final MangaGenre[] mGenres = new MangaGenre[] {
+ new MangaGenre(R.string.genre_doujinshi, "f_doujinshi"),
+ new MangaGenre(R.string.genre_manga, "f_manga"),
+ new MangaGenre(R.string.genre_artistcg, "f_artistcg"),
+ new MangaGenre(R.string.genre_gamecg, "f_gamecg"),
+ new MangaGenre(R.string.genre_western, "f_western"),
+ new MangaGenre(R.string.genre_nonh, "f_non-h"),
+ new MangaGenre(R.string.genre_imageset, "f_imageset"),
+ new MangaGenre(R.string.genre_cosplay, "f_cosplay"),
+ new MangaGenre(R.string.genre_asianporn, "f_asianporn"),
+ new MangaGenre(R.string.genre_misc, "f_misc"),
+ };
+
+ @NonNull
+ private String mDomain;
+
+ public ExhentaiProvider(Context context) {
+ super(context);
+ final String authCookie = getAuthCookie();
+ if (authCookie == null) {
+ mDomain = "e-hentai.org";
+ } else {
+ mDomain = "exhentai.org";
+ CookieStore.getInstance().put(mDomain, authCookie);
+ }
+ }
+
+ @NonNull
+ @Override
+ @SuppressLint("DefaultLocale")
+ public ArrayList query(@Nullable String search, int page, int sortOrder, @NonNull String[] genres) throws Exception {
+ final StringJoinerCompat query = new StringJoinerCompat("&", "", "&");
+ for (String g : genres) {
+ query.add(g + "=1");
+ }
+ if (search != null) {
+ query.add("f_search=" + search);
+ }
+ String url = String.format(
+ "https://%s/?page=%d&%sf_apply=Apply+Filter",
+ mDomain,
+ page,
+ query.toString()
+ );
+ final Document document = NetworkUtils.getDocument(url);
+ final Element root = document.body().select("div.itg").first();
+ final Elements elements = root.select("div.id1");
+ if (elements == null) {
+ throw new RuntimeException("div.id1 is null");
+ }
+ final ArrayList list = new ArrayList<>(elements.size());
+ for (Element o : elements) {
+ try {
+ final Element a = o.selectFirst("a");
+ final String name = a.text();
+ list.add(new MangaHeader(
+ name.replaceAll("\\[[^\\[,\\]]+]", "").trim(),
+ getFromBrackets(name),
+ "",
+ a.attr("href"),
+ o.selectFirst("img").attr("src"),
+ CNAME,
+ MangaStatus.STATUS_UNKNOWN,
+ parseRating(o.select("div.id43").first().attr("style"))
+ ));
+ } catch (Exception ignored) {
+ }
+ }
+ return list;
+ }
+
+ @SuppressLint("DefaultLocale")
+ @NonNull
+ @Override
+ public MangaDetails getDetails(MangaHeader header) throws Exception {
+ final Element body = NetworkUtils.getDocument(header.url).body();
+ final Element taglist = body.getElementById("taglist");
+ final StringBuilder description = new StringBuilder();
+ final Elements trs = taglist.select("tr");
+ String author = "";
+ for (Element o : trs) {
+ final Element td = o.selectFirst("td");
+ if (td == null) {
+ continue;
+ }
+ final String title = td.text();
+ if (title.startsWith("artist")) {
+ author = td.nextElementSibling().text();
+ continue;
+ }
+ description.append("")
+ .append(title)
+ .append(" ")
+ .append(td.nextElementSibling().text())
+ .append("
");
+ }
+ String cover = header.thumbnail;
+ try {
+ final String pvw = body.getElementById("gd1").child(0).attr("style");
+ int p = pvw.indexOf("url(") + 4;
+ cover = pvw.substring(p, pvw.indexOf(')', p));
+ } catch (Exception ignored) {
+ }
+ final MangaDetails details = new MangaDetails(
+ header,
+ description.toString(),
+ cover,
+ author
+ );
+ final Element table = body.selectFirst("table.ptt");
+ if (table != null) {
+ final Elements cells = table.select("td");
+ if (cells.size() > 2) {
+ cells.remove(cells.size() - 1);
+ cells.remove(0);
+ for (int i = 0; i < cells.size(); i++) {
+ final Element a = cells.get(i).selectFirst("a");
+ if (a != null) {
+ details.chapters.add(new MangaChapter(
+ String.format("%s (%s)", header.name, a.text()),
+ i,
+ url("https://" + mDomain, a.attr("href")),
+ header.provider
+ ));
+ }
+ }
+ } else {
+ details.chapters.add(new MangaChapter(
+ header.name,
+ 0,
+ header.url,
+ header.provider
+ ));
+ }
+ }
+ return details;
+ }
+
+ @NonNull
+ @Override
+ public ArrayList getPages(String chapterUrl) throws Exception {
+ final ArrayList pages = new ArrayList<>();
+ final Element body = NetworkUtils.getDocument(chapterUrl).body();
+ final Elements cells = body.select("div.gdtm");
+ for (Element cell : cells) {
+ pages.add(new MangaPage(
+ url("https://" + mDomain, cell.selectFirst("a").attr("href")),
+ CNAME
+ ));
+ }
+ return pages;
+ }
+
+ @NonNull
+ @Override
+ public String getImageUrl(MangaPage page) throws Exception {
+ return url("https://" + mDomain, NetworkUtils.getDocument(page.url).getElementById("img").attr("src"));
+ }
+
+ @Override
+ public boolean isAuthorizationSupported() {
+ return true;
+ }
+
+ @Nullable
+ @Override
+ public String authorize(@NonNull String login, @NonNull String password) throws Exception {
+ String cookie = NetworkUtils.authorize(
+ "https://forums.e-hentai.org/index.php?act=Login&CODE=01",
+ "referer",
+ "https://forums.e-hentai.org/index.php",
+ "UserName",
+ login,
+ "PassWord",
+ password,
+ "CookieDate",
+ "1"
+ );
+ if (cookie == null || !cookie.contains("ipb_pass_hash")) {
+ return null;
+ }
+ cookie = COOKIE_DEFAULT + "; " + cookie;
+ mDomain = "exhentai.org";
+ setAuthCookie(cookie);
+ return cookie;
+ }
+
+ private short parseRating(String r) {
+ r = r.substring(
+ r.indexOf(":") + 1,
+ r.indexOf(";")
+ );
+ String[] a = r.split(" ");
+ short res;
+ switch (a[0].trim()) {
+ case "0px":
+ res = 90;
+ break;
+ case "-16px":
+ res = 70;
+ break;
+ case "-32px":
+ res = 50;
+ break;
+ case "-48px":
+ res = 30;
+ break;
+ case "-64px":
+ res = 10;
+ break;
+ default:
+ res = 0;
+ }
+ if (a.length > 1 && res != 0 && "-1px".equals(a[1])) {
+ res += 10;
+ }
+ return res;
+ }
+
+ @NonNull
+ private String getFromBrackets(String src) {
+ Matcher m = Pattern.compile("\\[[^\\[,\\]]+]").matcher(src);
+ StringBuilder sb = new StringBuilder();
+ String t;
+ boolean firstTime = true;
+ while (m.find()) {
+ t = m.group(0);
+ t = t.substring(1, t.length() - 2);
+ if (firstTime) {
+ firstTime = false;
+ } else {
+ sb.append(", ");
+ }
+ sb.append(t);
+ }
+ return sb.toString();
+ }
+
+ @Override
+ public MangaGenre[] getAvailableGenres() {
+ return mGenres;
+ }
+}
diff --git a/app/src/main/java/org/nv95/openmanga/core/providers/GroupleMangaProvider.java b/app/src/main/java/org/nv95/openmanga/core/providers/GroupleMangaProvider.java
new file mode 100644
index 00000000..184fcd27
--- /dev/null
+++ b/app/src/main/java/org/nv95/openmanga/core/providers/GroupleMangaProvider.java
@@ -0,0 +1,178 @@
+package org.nv95.openmanga.core.providers;
+
+import android.content.Context;
+import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
+import android.text.TextUtils;
+
+import org.json.JSONArray;
+import org.jsoup.nodes.Document;
+import org.jsoup.nodes.Element;
+import org.jsoup.select.Elements;
+import org.nv95.openmanga.common.StringJoinerCompat;
+import org.nv95.openmanga.common.utils.network.NetworkUtils;
+import org.nv95.openmanga.core.MangaStatus;
+import org.nv95.openmanga.core.models.MangaChapter;
+import org.nv95.openmanga.core.models.MangaChaptersList;
+import org.nv95.openmanga.core.models.MangaDetails;
+import org.nv95.openmanga.core.models.MangaHeader;
+import org.nv95.openmanga.core.models.MangaPage;
+
+import java.util.ArrayList;
+
+/**
+ * Created by koitharu on 26.01.18.
+ */
+
+abstract class GroupleMangaProvider extends MangaProvider {
+
+ public GroupleMangaProvider(Context context) {
+ super(context);
+ }
+
+ @NonNull
+ @Override
+ public ArrayList query(@Nullable String search, int page, int sortOrder, @NonNull String[] genres) throws Exception {
+ boolean hasQuery = !TextUtils.isEmpty(search);
+ boolean multipleGenres = genres.length >= 1;
+ if (multipleGenres) {
+ return page != 0 ? EMPTY_HEADERS : advancedSearch(org.nv95.openmanga.common.utils.TextUtils.notNull(search), genres);
+ } else if (hasQuery) {
+ return simpleSearch(search, page);
+ } else {
+ return getList(page, sortOrder, null);
+ }
+ }
+
+ @NonNull
+ protected abstract ArrayList getList(int page, int sortOrder, @Nullable String genre) throws Exception;
+
+ @NonNull
+ protected abstract ArrayList simpleSearch(@NonNull String search, int page) throws Exception;
+
+ @NonNull
+ protected abstract ArrayList advancedSearch(@NonNull String search, @NonNull String[] genres) throws Exception;
+
+ protected final ArrayList parseList(Elements elements, String domain) {
+ final ArrayList list = new ArrayList<>(elements.size());
+ for (Element e : elements) {
+ if (!e.select(".fa-external-link").isEmpty()) {
+ continue;
+ }
+ final Element title = e.selectFirst("h3").child(0);
+ final Element rating = e.selectFirst("div.rating");
+ final Element tags = e.selectFirst(".tags");
+ int status = MangaStatus.STATUS_UNKNOWN;
+ if (!tags.select(".mangaCompleted").isEmpty()) {
+ status = MangaStatus.STATUS_COMPLETED;
+ } else if (!tags.select(".mangaTranslationCompleted").isEmpty()) {
+ status = MangaStatus.STATUS_COMPLETED;
+ }
+ final Element subtitle = e.selectFirst("h4");
+ final Element img = e.selectFirst("img.lazy");
+ list.add(new MangaHeader(
+ title.text(),
+ subtitle == null ? "" : subtitle.text(),
+ parseGenres(e.select(".element-link"), ""),
+ url(domain, title.attr("href")),
+ img == null ? "" : img.attr("data-original"),
+ getCName(),
+ status,
+ rating == null ? 0 : parseRating(rating.attr("title"))
+ ));
+ }
+ return list;
+ }
+
+ private short parseRating(String title) {
+ try {
+ int p = title.indexOf('.');
+ return Short.parseShort(title.substring(0, p + 2).replace(".", ""));
+ } catch (Exception e) {
+ e.printStackTrace();
+ return 0;
+ }
+ }
+
+ @NonNull
+ @Override
+ public MangaDetails getDetails(MangaHeader header) throws Exception {
+ final Document doc = NetworkUtils.getDocument(header.url);
+ Element root = doc.body().getElementById("mangaBox");
+ final Element description = root.selectFirst(".manga-description");
+ final Element author = root.selectFirst(".elem_author");
+ final MangaDetails details = new MangaDetails(
+ header.id,
+ header.name,
+ header.summary,
+ parseGenres(root.select(".elem_genre a"),header.genres),
+ header.url,
+ header.thumbnail,
+ header.provider,
+ header.status,
+ header.rating,
+ description == null ? "" : description.html(),
+ root.selectFirst("div.picture-fotorama").child(0).attr("data-full"),
+ author == null ? "" : author.child(0).text(),
+ new MangaChaptersList()
+ );
+ root = root.selectFirst("div.chapters-link");
+ if (root == null) {
+ return details;
+ }
+ root = root.selectFirst("tbody");
+ final Elements ch = root.select("a");
+ final String domain = NetworkUtils.getDomainWithScheme(header.url);
+ final int len = ch.size();
+ for (int i = 0; i < len; i++) {
+ Element o = ch.get(len - i - 1);
+ details.chapters.add(new MangaChapter(
+ o.text(),
+ i,
+ url(domain, o.attr("href") + "?mtr=1"),
+ header.provider
+ ));
+ }
+ return details;
+ }
+
+ @NonNull
+ @Override
+ public ArrayList getPages(String chapterUrl) throws Exception {
+ final Elements scripts = NetworkUtils.getDocument(chapterUrl).select("script");
+ final String domain = NetworkUtils.getDomainWithScheme(chapterUrl);
+ final ArrayList pages = new ArrayList<>();
+ for (Element script : scripts) {
+ String s = script.html();
+ int start = s.indexOf("rm_h.init(");
+ if (start == -1) {
+ continue;
+ }
+ start += 10;
+ final int p = s.lastIndexOf("]") + 1;
+ s = s.substring(start, p);
+ final JSONArray array = new JSONArray(s);
+ for (int i = 0; i < array.length(); i++) {
+ JSONArray item = array.getJSONArray(i);
+ pages.add(new MangaPage(
+ url(domain, item.getString(1) + item.getString(0) + item.getString(2)),
+ getCName()
+ ));
+ }
+ return pages;
+ }
+ throw new RuntimeException("No reader script found");
+ }
+
+ @NonNull
+ private String parseGenres(@Nullable Elements elements, @NonNull String defValue) {
+ if (elements == null || elements.isEmpty()) {
+ return defValue;
+ }
+ StringJoinerCompat joiner = new StringJoinerCompat(", ");
+ for (Element o : elements) {
+ joiner.add(o.text());
+ }
+ return joiner.toString();
+ }
+}
diff --git a/app/src/main/java/org/nv95/openmanga/core/providers/MangaFoxProvider.java b/app/src/main/java/org/nv95/openmanga/core/providers/MangaFoxProvider.java
new file mode 100644
index 00000000..8484faa5
--- /dev/null
+++ b/app/src/main/java/org/nv95/openmanga/core/providers/MangaFoxProvider.java
@@ -0,0 +1,230 @@
+package org.nv95.openmanga.core.providers;
+
+import android.content.Context;
+import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
+import android.text.TextUtils;
+
+import org.jsoup.nodes.Document;
+import org.jsoup.nodes.Element;
+import org.jsoup.select.Elements;
+import org.nv95.openmanga.R;
+import org.nv95.openmanga.common.StringJoinerCompat;
+import org.nv95.openmanga.common.utils.CollectionsUtils;
+import org.nv95.openmanga.common.utils.network.NetworkUtils;
+import org.nv95.openmanga.common.utils.network.UrlQueryBuilder;
+import org.nv95.openmanga.core.MangaStatus;
+import org.nv95.openmanga.core.models.MangaChapter;
+import org.nv95.openmanga.core.models.MangaDetails;
+import org.nv95.openmanga.core.models.MangaGenre;
+import org.nv95.openmanga.core.models.MangaHeader;
+import org.nv95.openmanga.core.models.MangaPage;
+import org.nv95.openmanga.core.providers.MangaProvider;
+
+import java.util.ArrayList;
+import java.util.regex.Pattern;
+
+public final class MangaFoxProvider extends MangaProvider {
+
+ public static final String CNAME = "network/mangafox";
+ public static final String DNAME = "MangaFox";
+
+ private final int[] mSorts = new int[]{
+ R.string.sort_updated,
+ R.string.sort_rating,
+ R.string.sort_popular,
+ R.string.sort_alphabetical
+ };
+
+ private final String[] mSortValues = new String[]{
+ "?latest",
+ "?rating",
+ "",
+ "?az"
+ };
+
+ private final String[] mSortValuesAdv = new String[]{
+ "last_chapter_time",
+ "rating",
+ "views",
+ "name"
+ };
+
+ private final MangaGenre[] mGenres = new MangaGenre[]{
+ new MangaGenre(R.string.genre_action, "action"),
+ new MangaGenre(R.string.genre_adult, "adult"),
+ new MangaGenre(R.string.genre_adventure, "adventure"),
+ new MangaGenre(R.string.genre_comedy, "comedy"),
+ new MangaGenre(R.string.genre_doujinshi, "doujinshi"),
+ new MangaGenre(R.string.genre_drama, "drama"),
+ new MangaGenre(R.string.genre_ecchi, "ecchi"),
+ new MangaGenre(R.string.genre_fantasy, "fantasy"),
+ new MangaGenre(R.string.genre_genderbender, "gender-bender"),
+ new MangaGenre(R.string.genre_harem, "harem"),
+ new MangaGenre(R.string.genre_historical, "historical"),
+ new MangaGenre(R.string.genre_horror, "horror"),
+ new MangaGenre(R.string.genre_josei, "josei"),
+ new MangaGenre(R.string.genre_martialarts, "martial-arts"),
+ new MangaGenre(R.string.genre_mature, "mature"),
+ new MangaGenre(R.string.genre_mecha, "mecha"),
+ new MangaGenre(R.string.genre_mystery, "mystery"),
+ new MangaGenre(R.string.genre_oneshot, "one-shot"),
+ new MangaGenre(R.string.genre_psychological, "psychological"),
+ new MangaGenre(R.string.genre_romance, "romance"),
+ new MangaGenre(R.string.genre_school, "school-life"),
+ new MangaGenre(R.string.genre_sci_fi, "sci-fi"),
+ new MangaGenre(R.string.genre_seinen, "seinen"),
+ new MangaGenre(R.string.genre_shoujo, "shoujo"),
+ new MangaGenre(R.string.genre_shoujo_ai, "shoujo-ai"),
+ new MangaGenre(R.string.genre_shounen, "shounen"),
+ new MangaGenre(R.string.genre_shounen_ai, "shounen-ai"),
+ new MangaGenre(R.string.genre_slice_of_life, "slice-of-life"),
+ new MangaGenre(R.string.genre_smut, "smut"),
+ new MangaGenre(R.string.genre_sports, "sports"),
+ new MangaGenre(R.string.genre_supernatural, "supernatural"),
+ new MangaGenre(R.string.genre_tragedy, "tragedy"),
+ new MangaGenre(R.string.web, "webtoons"),
+ new MangaGenre(R.string.genre_yaoi, "yaoi"),
+ new MangaGenre(R.string.genre_yuri, "yuri"),
+
+ };
+
+ public MangaFoxProvider(Context context) {
+ super(context);
+ }
+
+ @NonNull
+ @Override
+ public ArrayList query(@Nullable String search, int page, int sortOrder, @NonNull String[] genres) throws Exception {
+ boolean hasQuery = !TextUtils.isEmpty(search);
+ boolean multipleGenres = genres.length > 1;
+ Element root;
+ if (multipleGenres || hasQuery) { //advanced search
+ final UrlQueryBuilder query = new UrlQueryBuilder("http://fanfox.net/search.php");
+ query.put("advopts", 1);
+ query.put("artist", "");
+ query.put("artist_method", "cw");
+ query.put("author", "");
+ query.put("artist_method", "cw");
+ for (MangaGenre g : mGenres) {
+ query.put("genres[" + g.value.replaceAll("-", "+") + "]", CollectionsUtils.contains(genres, g) ? 1 : 0);
+ }
+ query.put("is_completed", "");
+ query.put("name", urlEncode(search));
+ query.put("name_method", "cw");
+ query.put("rating", "");
+ query.put("rating_method", "eq");
+ query.put("released", "");
+ query.put("released_method", "eq");
+ if (sortOrder != -1) {
+ query.put("order", "za");
+ query.put("sort", mSortValuesAdv[sortOrder]);
+ }
+ final Document doc = NetworkUtils.getDocument(query.toString());
+ root = doc.body().getElementById("listing").selectFirst("div.left");
+ } else {
+ final String genre = CollectionsUtils.getOrNull(genres, 0);
+ final Document doc = NetworkUtils.getDocument("http://fanfox.net/directory/" + (TextUtils.isEmpty(genre) ? "" : genre + "/")
+ + page + ".htm" + (sortOrder == -1 ? mSortValues[0] : mSortValues[sortOrder]));
+ root = doc.body().getElementById("mangalist");
+ }
+ final Elements elements = root.selectFirst("ul.list").select("li");
+ final ArrayList list = new ArrayList<>(elements.size());
+ for (Element o : elements) {
+ try {
+ final Element a = o.selectFirst("a.title");
+ final String name = a.text();
+ list.add(new MangaHeader(
+ name,
+ "",
+ o.selectFirst("p.info").attr("title"),
+ "http:" + a.attr("href"),
+ o.selectFirst("img").attr("src"),
+ CNAME,
+ MangaStatus.STATUS_UNKNOWN,
+ (short) (Integer.parseInt(o.selectFirst("span.rate").text().replaceAll("[^0-9]", "")) * 2)
+ ));
+ } catch (Exception ignored) {
+ }
+ }
+ return list;
+ }
+
+ @NonNull
+ @Override
+ public MangaDetails getDetails(MangaHeader header) throws Exception {
+ final Document doc = NetworkUtils.getDocument(header.url);
+ Element root = doc.body().getElementById("page");
+ final Element title = root.getElementById("title");
+ String author = "";
+ try {
+ author = title.selectFirst("table").select("tr").get(1).select("td").get(1).text();
+ } catch (Exception ignored) {
+ }
+ String description = title.selectFirst("p.summary").html();
+ final Element warning = root.selectFirst("div.warning");
+ if (warning != null) {
+ description = String.format("%s
", warning.html()) + description;
+ }
+ final MangaDetails details = new MangaDetails(
+ header,
+ description,
+ root.selectFirst("div.cover").selectFirst("img").attr("src"),
+ author
+ );
+ root = root.getElementById("chapters");
+ final Elements lis = root.select("li");
+ int i = 0;
+ for (Element li : lis) {
+ final Element h3 = li.selectFirst("h3");
+ if (h3 == null) {
+ continue;
+ }
+ final Element a = h3.selectFirst("a");
+ details.chapters.add(new MangaChapter(
+ h3.text(),
+ i,
+ "http:" + a.attr("href"),
+ header.provider
+ ));
+ i++;
+ }
+ return details;
+ }
+
+ @NonNull
+ @Override
+ public ArrayList getPages(String chapterUrl) throws Exception {
+ final ArrayList