diff --git a/CHANGELOG.md b/CHANGELOG.md
new file mode 100644
index 000000000..94a3138a6
--- /dev/null
+++ b/CHANGELOG.md
@@ -0,0 +1,27 @@
+# Change Log
+
+## 0.5.3
+
+- FolioReader migrated to AndroidX.
+- Search API calls made asynchronous.
+
+### Bugs Fixed
+
+- FolioReader/FolioReader-Android#190
+- FolioReader/FolioReader-Android#276
+- FolioReader/FolioReader-Android#239
+- FolioReader/FolioReader-Android#308
+- FolioReader/FolioReader-Android#284
+- FolioReader/FolioReader-Android#298
+
+## 0.5.2 (Unreleased)
+
+- ReadPosition replaced with ReadLocator using CFI.
+- TTS feature temporarily disabled, see KNOWN_ISSUES.md for more information.
+- SearchQueryResults and SearchItem replaced with SearchLocator using CFI.
+
+## 0.5.1
+
+- r2-streamer-java replaced with r2-streamer-kotlin and r2-shared-kotlin
+- WebViewMarker replaced with Native text selection popup.
+- Media Overlay feature temporarily unavailable, see KNOWN_ISSUES.md for more information.
\ No newline at end of file
diff --git a/KNOWN_ISSUES.md b/KNOWN_ISSUES.md
new file mode 100644
index 000000000..b6c9e0132
--- /dev/null
+++ b/KNOWN_ISSUES.md
@@ -0,0 +1,23 @@
+# Known Issues
+
+This is a list of major known issues. For the latest list of all issues see the
+[Github Issues page](https://github.com/FolioReader/FolioReader-Android/issues)
+
+## Errors on API 21 and 22 with Webview lower than version 44
+
+FolioReader might not work properly on API 21 and 22 Emulator images.
+As these images have Android System Webview lower than version 44.
+Devices or Emulator of API 21 and 22 with Google Play Store will be
+able to run FolioReader without any error after updating Android System
+Webview to version 44+
+
+## Media Overlay
+
+From version 0.5.1, Media Overlay would not work as the streamer implementation is not done yet in r2-streamer-kotlin.
+
+## TTS
+
+From version 0.5.2, TTS is disabled.
+In previous versions, sentences were formed by changing the DOM structure.
+To implement TTS without changing DOM would require NLP to extract sentences.
+As of now, no major reading systems other than Google Play Books implements TTS bug free.
\ No newline at end of file
diff --git a/MIGRATION.md b/MIGRATION.md
new file mode 100644
index 000000000..14fcc21c1
--- /dev/null
+++ b/MIGRATION.md
@@ -0,0 +1,9 @@
+# Migration
+
+## 0.5.2
+
+- Developer now don't need to add network_security_config.xml explicitly.
+
+## 0.4.1
+
+- Developer now don't need to specify permissions and FolioActivity tag in AndroidManifest.xml
\ No newline at end of file
diff --git a/README.md b/README.md
index b0009cd6b..73dd87eca 100644
--- a/README.md
+++ b/README.md
@@ -2,7 +2,7 @@
[](https://travis-ci.org/FolioReader/FolioReader-Android)
-FolioReader-Android is an ePub reader written in Java.
+FolioReader-Android is an EPUB reader written in Java and Kotlin.
### Features
@@ -13,17 +13,17 @@ FolioReader-Android is an ePub reader written in Java.
- [x] List / Edit / Delete Highlights
- [x] Handle Internal and External Links
- [x] Portrait / Landscape
-- [x] Reading Time Left / Pages left
+- [ ] Reading Time Left / Pages left
- [x] In-App Dictionary
-- [x] Media Overlays (Sync text rendering with audio playback)
-- [x] TTS - Text to Speech Support
+- [ ] Media Overlays (Sync text rendering with audio playback)
+- [ ] TTS - Text to Speech Support
- [ ] Parse epub cover image
- [ ] PDF support
- [x] Book Search
- [x] Add Notes to a Highlight
- [ ] Better Documentation
-- [x] Last Read Position Listener
-- [x] Horizontal reading
+- [x] Last Read Locator
+- [x] Horizontal Reading
- [x] Distraction Free Reading
## Demo
@@ -31,9 +31,9 @@ FolioReader-Android is an ePub reader written in Java.
##### Day and Night Mode
-##### Text Highlighting
+##### Text Highlighting
-##### Media Overlays
+##### Media Overlays
### Gradle
@@ -44,7 +44,7 @@ Add following dependency to your root project `build.gradle` file:
allprojects {
repositories {
...
- maven { url "https://dl.bintray.com/mobisystech/maven" }
+ jcenter()
maven { url "https://jitpack.io" }
...
}
@@ -56,39 +56,14 @@ Add following dependency to your app module `build.gradle` file:
```groovy
dependencies {
...
- implementation "com.folioreader:folioreader:0.5.1"
+ implementation "com.folioreader:folioreader:0.5.3"
...
}
```
+### Enable Multidex support
-### AndroidManifest
-
-Starting with Android 9.0 (API level 28), cleartext support is disabled by default.
-
-{your-app-module}/res/xml/network_security_config.xml
-
-```xml
-
-
-
- 127.0.0.1
- localhost
-
-
-```
-
-Then add network_security_config.xml in your app module's AndroidManifest.xml
-
-```xml
-
-
- ...
-
- ...
-
-
-```
+Enable Multidex support as explained in this [Android Doc](https://developer.android.com/studio/build/multidex)
### Usage
@@ -100,22 +75,17 @@ FolioReader folioReader = FolioReader.get();
Call the function `openBook()`:
-##### opening book from assets -
+##### opening book from assets -
```java
folioReader.openBook("file:///android_asset/TheSilverChair.epub");
```
-##### opening book from raw -
+##### opening book from raw -
```java
folioReader.openBook(R.raw.adventures);
```
-
-
-**Note: From v0.4.1 you don't need to specify permissions and `FolioActivity` tag in AndroidManifest.xml**
-
-
## WIKI
@@ -126,21 +96,19 @@ folioReader.openBook(R.raw.adventures);
* [Highlight Action](https://github.com/FolioReader/FolioReader-Android/wiki/Highlight-Action)
* [Highlight Event](https://github.com/FolioReader/FolioReader-Android/wiki/Highlight-Event)
* [Providing External Highlight](https://github.com/FolioReader/FolioReader-Android/wiki/Providing-External-Highlight)
-* [ReadPosition](https://github.com/FolioReader/FolioReader-Android/wiki/ReadPosition)
- * [Get ReadPosition](https://github.com/FolioReader/FolioReader-Android/wiki/Get-ReadPosition)
- * [Set ReadPosition](https://github.com/FolioReader/FolioReader-Android/wiki/Set-ReadPosition)
+* [ReadLocator](https://github.com/FolioReader/FolioReader-Android/wiki/ReadLocator)
* [Clean up code](https://github.com/FolioReader/FolioReader-Android/wiki/Clean-up-code)
## Reporting Issue
-Please follow [Issue Template](https://github.com/FolioReader/FolioReader-Android/blob/master/.github/ISSUE_TEMPLATE.md) to report any issue.
+Please follow [Issue Template](https://github.com/FolioReader/FolioReader-Android/blob/master/.github/ISSUE_TEMPLATE.md) to report any issue.
## Share your application
If you are using FolioReader in your application, share your application link in [this issue](https://github.com/FolioReader/FolioReader-Android/issues/291)
### Credits
1. SwipeLayout
-2. r2-streamer-java
+2. r2-streamer-kotlin
3. Pearson Dictionaries
4. rangy
diff --git a/ViewPager/.gitignore b/ViewPager/.gitignore
deleted file mode 100644
index 796b96d1c..000000000
--- a/ViewPager/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/build
diff --git a/ViewPager/build.gradle b/ViewPager/build.gradle
deleted file mode 100644
index 0869ca67a..000000000
--- a/ViewPager/build.gradle
+++ /dev/null
@@ -1,24 +0,0 @@
-apply plugin: 'android-library'
-
-repositories {
- mavenCentral()
-}
-
-android {
- compileSdkVersion 27
- buildToolsVersion "27.0.0"
-
- defaultConfig {
- minSdkVersion 14
- targetSdkVersion 27
- }
-
- compileOptions {
- sourceCompatibility JavaVersion.VERSION_1_7
- targetCompatibility JavaVersion.VERSION_1_7
- }
-}
-
-dependencies {
- compile 'com.android.support:appcompat-v7:27.0.0'
-}
diff --git a/ViewPager/src/main/AndroidManifest.xml b/ViewPager/src/main/AndroidManifest.xml
deleted file mode 100644
index 7830b68b5..000000000
--- a/ViewPager/src/main/AndroidManifest.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-
-
-
-
-
-
-
diff --git a/ViewPager/src/main/java/com/ryanharter/viewpager/PagerAdapter.java b/ViewPager/src/main/java/com/ryanharter/viewpager/PagerAdapter.java
deleted file mode 100644
index f3204a9cd..000000000
--- a/ViewPager/src/main/java/com/ryanharter/viewpager/PagerAdapter.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package com.ryanharter.viewpager;
-
-/**
- * {@inheritDoc}
- */
-public abstract class PagerAdapter extends android.support.v4.view.PagerAdapter {
-
- /**
- * {@inheritDoc}
- * @deprecated Use {@link #getPageSize(int)} instead.
- */
- @Override
- public float getPageWidth(int position) {
- return super.getPageWidth(position);
- }
-
- /**
- * Returns the proportional size (width or height depending on orientation)
- * of a given page as a percentage of the ViewPager's measured size from (0.f-1.f).
- *
- * @param position The position of the page requested
- * @return Proportional size for the given page position
- */
- public float getPageSize(int position) {
- return getPageWidth(position);
- }
-}
diff --git a/ViewPager/src/main/java/com/ryanharter/viewpager/ViewPager.java b/ViewPager/src/main/java/com/ryanharter/viewpager/ViewPager.java
deleted file mode 100644
index f0545d786..000000000
--- a/ViewPager/src/main/java/com/ryanharter/viewpager/ViewPager.java
+++ /dev/null
@@ -1,3294 +0,0 @@
-/*
- * Copyright (C) 2011 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.ryanharter.viewpager;
-
-import android.content.Context;
-import android.content.res.Resources;
-import android.content.res.TypedArray;
-import android.database.DataSetObserver;
-import android.graphics.Canvas;
-import android.graphics.Rect;
-import android.graphics.drawable.Drawable;
-import android.os.Build;
-import android.os.Bundle;
-import android.os.Parcel;
-import android.os.Parcelable;
-import android.os.SystemClock;
-import android.support.v4.os.ParcelableCompat;
-import android.support.v4.os.ParcelableCompatCreatorCallbacks;
-import android.support.v4.view.AccessibilityDelegateCompat;
-import android.support.v4.view.KeyEventCompat;
-import android.support.v4.view.MotionEventCompat;
-import android.support.v4.view.VelocityTrackerCompat;
-import android.support.v4.view.ViewCompat;
-import android.support.v4.view.ViewConfigurationCompat;
-import android.support.v4.view.accessibility.AccessibilityEventCompat;
-import android.support.v4.view.accessibility.AccessibilityNodeInfoCompat;
-import android.support.v4.view.accessibility.AccessibilityRecordCompat;
-import android.support.v4.widget.EdgeEffectCompat;
-import android.util.AttributeSet;
-import android.util.Log;
-import android.view.FocusFinder;
-import android.view.Gravity;
-import android.view.KeyEvent;
-import android.view.MotionEvent;
-import android.view.SoundEffectConstants;
-import android.view.VelocityTracker;
-import android.view.View;
-import android.view.ViewConfiguration;
-import android.view.ViewGroup;
-import android.view.ViewParent;
-import android.view.accessibility.AccessibilityEvent;
-import android.view.animation.Interpolator;
-import android.widget.Scroller;
-
-import java.lang.reflect.Method;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Comparator;
-
-/**
- * Layout manager that allows the user to flip left and right
- * through pages of data. You supply an implementation of a
- * {@link PagerAdapter} to generate the pages that the view shows.
- *
- *
Note this class is currently under early design and
- * development. The API will likely change in later updates of
- * the compatibility library, requiring changes to the source code
- * of apps when they are compiled against the newer version.
- *
- *
ViewPager is most often used in conjunction with {@link android.app.Fragment},
- * which is a convenient way to supply and manage the lifecycle of each page.
- * There are standard adapters implemented for using fragments with the ViewPager,
- * which cover the most common use cases. These are
- * {@link android.support.v4.app.FragmentPagerAdapter} and
- * {@link android.support.v4.app.FragmentStatePagerAdapter}; each of these
- * classes have simple code showing how to build a full user interface
- * with them.
- *
- *
Here is a more complicated example of ViewPager, using it in conjuction
- * with {@link android.app.ActionBar} tabs. You can find other examples of using
- * ViewPager in the API 4+ Support Demos and API 13+ Support Demos sample code.
- *
- * {@sample development/samples/Support13Demos/src/com/example/android/supportv13/app/ActionBarTabsPager.java
- * complete}
- */
-public class ViewPager extends ViewGroup {
- private static final String TAG = "ViewPager";
- private static final boolean DEBUG = false;
-
- private static final boolean USE_CACHE = false;
-
- private static final int DEFAULT_OFFSCREEN_PAGES = 1;
- private static final int MAX_SETTLE_DURATION = 600; // ms
- private static final int MIN_DISTANCE_FOR_FLING = 25; // dips
-
- private static final int DEFAULT_GUTTER_SIZE = 16; // dips
-
- private static final int MIN_FLING_VELOCITY = 400; // dips
-
- private static final int[] LAYOUT_ATTRS = new int[] {
- android.R.attr.layout_gravity
- };
-
- private static final int ORIENTATION_HORIZONTAL = 0;
- private static final int ORIENTATION_VERTICAL = 1;
-
- /**
- * Used to track what the expected number of items in the adapter should be.
- * If the app changes this when we don't expect it, we'll throw a big obnoxious exception.
- */
- private int mExpectedAdapterCount;
-
- static class ItemInfo {
- Object object;
- int position;
- boolean scrolling;
- float sizeFactor;
- float offset;
- }
-
- private static final Comparator COMPARATOR = new Comparator(){
- @Override
- public int compare(ItemInfo lhs, ItemInfo rhs) {
- return lhs.position - rhs.position;
- }
- };
-
- private static final Interpolator sInterpolator = new Interpolator() {
- public float getInterpolation(float t) {
- t -= 1.0f;
- return t * t * t * t * t + 1.0f;
- }
- };
-
- private final ArrayList mItems = new ArrayList();
- private final ItemInfo mTempItem = new ItemInfo();
-
- private final Rect mTempRect = new Rect();
-
- private PagerAdapter mAdapter;
- private int mCurItem; // Index of currently displayed page.
- private int mRestoredCurItem = -1;
- private Parcelable mRestoredAdapterState = null;
- private ClassLoader mRestoredClassLoader = null;
- private Scroller mScroller;
- private PagerObserver mObserver;
-
- private int mOrientation = ORIENTATION_HORIZONTAL;
- private int mPageMargin;
- private Drawable mMarginDrawable;
- private int mLeftPageBounds;
- private int mTopPageBounds;
- private int mRightPageBounds;
- private int mBottomPageBounds;
-
- // Offsets of the first and last items, if known.
- // Set during population, used to determine if we are at the beginning
- // or end of the pager data set during touch scrolling.
- private float mFirstOffset = -Float.MAX_VALUE;
- private float mLastOffset = Float.MAX_VALUE;
-
- private int mChildWidthMeasureSpec;
- private int mChildHeightMeasureSpec;
- private boolean mInLayout;
-
- private boolean mScrollingCacheEnabled;
-
- private boolean mPopulatePending;
- private int mOffscreenPageLimit = DEFAULT_OFFSCREEN_PAGES;
-
- private boolean mIsBeingDragged;
- private boolean mIsUnableToDrag;
- private boolean mIgnoreGutter;
- private int mDefaultGutterSize;
- private int mGutterSize;
- private int mTouchSlop;
- /**
- * Position of the last motion event.
- */
- private float mLastMotionX;
- private float mLastMotionY;
- private float mInitialMotionX;
- private float mInitialMotionY;
- /**
- * ID of the active pointer. This is used to retain consistency during
- * drags/flings if multiple pointers are used.
- */
- private int mActivePointerId = INVALID_POINTER;
- /**
- * Sentinel value for no current active pointer.
- * Used by {@link #mActivePointerId}.
- */
- private static final int INVALID_POINTER = -1;
-
- /**
- * Determines speed during touch scrolling
- */
- private VelocityTracker mVelocityTracker;
- private int mMinimumVelocity;
- private int mMaximumVelocity;
- private int mFlingDistance;
- private int mCloseEnough;
-
- // If the pager is at least this close to its final position, complete the scroll
- // on touch down and let the user interact with the content inside instead of
- // "catching" the flinging pager.
- private static final int CLOSE_ENOUGH = 2; // dp
-
- private boolean mFakeDragging;
- private long mFakeDragBeginTime;
-
- // TODO Do I need separate edge effects, or can I just reuse these with better names like mStartEdge, mEndEdge?
- private EdgeEffectCompat mLeftEdge;
- private EdgeEffectCompat mRightEdge;
-
- private boolean mFirstLayout = true;
- private boolean mNeedCalculatePageOffsets = false;
- private boolean mCalledSuper;
- private int mDecorChildCount;
-
- private OnPageChangeListener mOnPageChangeListener;
- private OnPageChangeListener mInternalPageChangeListener;
- private OnAdapterChangeListener mAdapterChangeListener;
- private PageTransformer mPageTransformer;
- private Method mSetChildrenDrawingOrderEnabled;
-
- private static final int DRAW_ORDER_DEFAULT = 0;
- private static final int DRAW_ORDER_FORWARD = 1;
- private static final int DRAW_ORDER_REVERSE = 2;
- private int mDrawingOrder;
- private ArrayList mDrawingOrderedChildren;
- private static final ViewPositionComparator sPositionComparator = new ViewPositionComparator();
-
- /**
- * Indicates that the pager is in an idle, settled state. The current page
- * is fully in view and no animation is in progress.
- */
- public static final int SCROLL_STATE_IDLE = 0;
-
- /**
- * Indicates that the pager is currently being dragged by the user.
- */
- public static final int SCROLL_STATE_DRAGGING = 1;
-
- /**
- * Indicates that the pager is in the process of settling to a final position.
- */
- public static final int SCROLL_STATE_SETTLING = 2;
-
- private final Runnable mEndScrollRunnable = new Runnable() {
- public void run() {
- setScrollState(SCROLL_STATE_IDLE);
- populate();
- }
- };
-
- private int mScrollState = SCROLL_STATE_IDLE;
-
- /**
- * Callback interface for responding to changing state of the selected page.
- */
- public interface OnPageChangeListener {
-
- /**
- * This method will be invoked when the current page is scrolled, either as part
- * of a programmatically initiated smooth scroll or a user initiated touch scroll.
- *
- * @param position Position index of the first page currently being displayed.
- * Page position+1 will be visible if positionOffset is nonzero.
- * @param positionOffset Value from [0, 1) indicating the offset from the page at position.
- * @param positionOffsetPixels Value in pixels indicating the offset from position.
- */
- public void onPageScrolled(int position, float positionOffset, int positionOffsetPixels);
-
- /**
- * This method will be invoked when a new page becomes selected. Animation is not
- * necessarily complete.
- *
- * @param position Position index of the new selected page.
- */
- public void onPageSelected(int position);
-
- /**
- * Called when the scroll state changes. Useful for discovering when the user
- * begins dragging, when the pager is automatically settling to the current page,
- * or when it is fully stopped/idle.
- *
- * @param state The new scroll state.
- * @see ViewPager#SCROLL_STATE_IDLE
- * @see ViewPager#SCROLL_STATE_DRAGGING
- * @see ViewPager#SCROLL_STATE_SETTLING
- */
- public void onPageScrollStateChanged(int state);
- }
-
- /**
- * Simple implementation of the {@link OnPageChangeListener} interface with stub
- * implementations of each method. Extend this if you do not intend to override
- * every method of {@link OnPageChangeListener}.
- */
- public static class SimpleOnPageChangeListener implements OnPageChangeListener {
- @Override
- public void onPageScrolled(int position, float positionOffset, int positionOffsetPixels) {
- // This space for rent
- }
-
- @Override
- public void onPageSelected(int position) {
- // This space for rent
- }
-
- @Override
- public void onPageScrollStateChanged(int state) {
- // This space for rent
- }
- }
-
- /**
- * A PageTransformer is invoked whenever a visible/attached page is scrolled.
- * This offers an opportunity for the application to apply a custom transformation
- * to the page views using animation properties.
- *
- *
As property animation is only supported as of Android 3.0 and forward,
- * setting a PageTransformer on a ViewPager on earlier platform versions will
- * be ignored.
- */
- public interface PageTransformer {
- /**
- * Apply a property transformation to the given page.
- *
- * @param page Apply the transformation to this page
- * @param position Position of page relative to the current front-and-center
- * position of the pager. 0 is front and center. 1 is one full
- * page position to the right, and -1 is one page position to the left.
- */
- public void transformPage(View page, float position);
- }
-
- /**
- * Used internally to monitor when adapters are switched.
- */
- interface OnAdapterChangeListener {
- public void onAdapterChanged(PagerAdapter oldAdapter, PagerAdapter newAdapter);
- }
-
- /**
- * Used internally to tag special types of child views that should be added as
- * pager decorations by default.
- */
- interface Decor {}
-
- public ViewPager(Context context) {
- this(context, null);
- }
-
- public ViewPager(Context context, AttributeSet attrs) {
- this(context, attrs, 0);
- }
-
- public ViewPager(Context context, AttributeSet attrs, int defStyle) {
- super(context, attrs, defStyle);
-
- TypedArray a = context.obtainStyledAttributes(attrs,
- R.styleable.ViewPager, defStyle, 0);
- mOrientation = a.getInt(R.styleable.ViewPager_orientation, ORIENTATION_HORIZONTAL);
- a.recycle();
-
- initViewPager();
- }
-
- void initViewPager() {
- setWillNotDraw(false);
- setDescendantFocusability(FOCUS_AFTER_DESCENDANTS);
- setFocusable(true);
- final Context context = getContext();
- mScroller = new Scroller(context, sInterpolator);
-
- final ViewConfiguration configuration = ViewConfiguration.get(context);
- final float density = context.getResources().getDisplayMetrics().density;
-
- mTouchSlop = ViewConfigurationCompat.getScaledPagingTouchSlop(configuration);
- mMinimumVelocity = (int) (MIN_FLING_VELOCITY * density);
- mMaximumVelocity = configuration.getScaledMaximumFlingVelocity();
- mLeftEdge = new EdgeEffectCompat(context);
- mRightEdge = new EdgeEffectCompat(context);
-
- mFlingDistance = (int) (MIN_DISTANCE_FOR_FLING * density);
- mCloseEnough = (int) (CLOSE_ENOUGH * density);
- mDefaultGutterSize = (int) (DEFAULT_GUTTER_SIZE * density);
-
- ViewCompat.setAccessibilityDelegate(this, new MyAccessibilityDelegate());
-
- if (ViewCompat.getImportantForAccessibility(this)
- == ViewCompat.IMPORTANT_FOR_ACCESSIBILITY_AUTO) {
- ViewCompat.setImportantForAccessibility(this,
- ViewCompat.IMPORTANT_FOR_ACCESSIBILITY_YES);
- }
- }
-
- @Override
- protected void onDetachedFromWindow() {
- removeCallbacks(mEndScrollRunnable);
- super.onDetachedFromWindow();
- }
-
- private void setScrollState(int newState) {
- if (mScrollState == newState) {
- return;
- }
-
- mScrollState = newState;
- if (mPageTransformer != null) {
- // PageTransformers can do complex things that benefit from hardware layers.
- enableLayers(newState != SCROLL_STATE_IDLE);
- }
- if (mOnPageChangeListener != null) {
- mOnPageChangeListener.onPageScrollStateChanged(newState);
- }
- }
-
- /**
- * Set a PagerAdapter that will supply views for this pager as needed.
- *
- * @param adapter Adapter to use
- */
- public void setAdapter(PagerAdapter adapter) {
- if (mAdapter != null) {
- mAdapter.unregisterDataSetObserver(mObserver);
- mAdapter.startUpdate(this);
- for (int i = 0; i < mItems.size(); i++) {
- final ItemInfo ii = mItems.get(i);
- mAdapter.destroyItem(this, ii.position, ii.object);
- }
- mAdapter.finishUpdate(this);
- mItems.clear();
- removeNonDecorViews();
- mCurItem = 0;
- scrollTo(0, 0);
- }
-
- final PagerAdapter oldAdapter = mAdapter;
- mAdapter = adapter;
- mExpectedAdapterCount = 0;
-
- if (mAdapter != null) {
- if (mObserver == null) {
- mObserver = new PagerObserver();
- }
- mAdapter.registerDataSetObserver(mObserver);
- mPopulatePending = false;
- final boolean wasFirstLayout = mFirstLayout;
- mFirstLayout = true;
- mExpectedAdapterCount = mAdapter.getCount();
- if (mRestoredCurItem >= 0) {
- mAdapter.restoreState(mRestoredAdapterState, mRestoredClassLoader);
- setCurrentItemInternal(mRestoredCurItem, false, true);
- mRestoredCurItem = -1;
- mRestoredAdapterState = null;
- mRestoredClassLoader = null;
- } else if (!wasFirstLayout) {
- populate();
- } else {
- requestLayout();
- }
- }
-
- if (mAdapterChangeListener != null && oldAdapter != adapter) {
- mAdapterChangeListener.onAdapterChanged(oldAdapter, adapter);
- }
- }
-
- private void removeNonDecorViews() {
- for (int i = 0; i < getChildCount(); i++) {
- final View child = getChildAt(i);
- final LayoutParams lp = (LayoutParams) child.getLayoutParams();
- if (!lp.isDecor) {
- removeViewAt(i);
- i--;
- }
- }
- }
-
- /**
- * Retrieve the current adapter supplying pages.
- *
- * @return The currently registered PagerAdapter
- */
- public PagerAdapter getAdapter() {
- return mAdapter;
- }
-
- void setOnAdapterChangeListener(OnAdapterChangeListener listener) {
- mAdapterChangeListener = listener;
- }
-
- public int getOrientation() {
- return mOrientation;
- }
-
- public boolean isOrientationHorizontal() {
- return mOrientation == ORIENTATION_HORIZONTAL;
- }
-
- private int getClientWidth() {
- return getMeasuredWidth() - getPaddingLeft() - getPaddingRight();
- }
-
- private int getClientHeight() {
- return getMeasuredHeight() - getPaddingTop() - getPaddingBottom();
- }
-
- /**
- * Set the currently selected page. If the ViewPager has already been through its first
- * layout with its current adapter there will be a smooth animated transition between
- * the current item and the specified item.
- *
- * @param item Item index to select
- */
- public void setCurrentItem(int item) {
- mPopulatePending = false;
- setCurrentItemInternal(item, !mFirstLayout, false);
- }
-
- /**
- * Set the currently selected page.
- *
- * @param item Item index to select
- * @param smoothScroll True to smoothly scroll to the new item, false to transition immediately
- */
- public void setCurrentItem(int item, boolean smoothScroll) {
- mPopulatePending = false;
- setCurrentItemInternal(item, smoothScroll, false);
- }
-
- public int getCurrentItem() {
- return mCurItem;
- }
-
- void setCurrentItemInternal(int item, boolean smoothScroll, boolean always) {
- setCurrentItemInternal(item, smoothScroll, always, 0);
- }
-
- void setCurrentItemInternal(int item, boolean smoothScroll, boolean always, int velocity) {
- if (mAdapter == null || mAdapter.getCount() <= 0) {
- setScrollingCacheEnabled(false);
- return;
- }
- if (!always && mCurItem == item && mItems.size() != 0) {
- setScrollingCacheEnabled(false);
- return;
- }
-
- if (item < 0) {
- item = 0;
- } else if (item >= mAdapter.getCount()) {
- item = mAdapter.getCount() - 1;
- }
- final int pageLimit = mOffscreenPageLimit;
- if (item > (mCurItem + pageLimit) || item < (mCurItem - pageLimit)) {
- // We are doing a jump by more than one page. To avoid
- // glitches, we want to keep all current pages in the view
- // until the scroll ends.
- for (int i=0; iNote: Prior to Android 3.0 the property animation APIs did not exist.
- * As a result, setting a PageTransformer prior to Android 3.0 (API 11) will have no effect.
- *
- * @param reverseDrawingOrder true if the supplied PageTransformer requires page views
- * to be drawn from last to first instead of first to last.
- * @param transformer PageTransformer that will modify each page's animation properties
- */
- public void setPageTransformer(boolean reverseDrawingOrder, PageTransformer transformer) {
- if (Build.VERSION.SDK_INT >= 11) {
- final boolean hasTransformer = transformer != null;
- final boolean needsPopulate = hasTransformer != (mPageTransformer != null);
- mPageTransformer = transformer;
- setChildrenDrawingOrderEnabledCompat(hasTransformer);
- if (hasTransformer) {
- mDrawingOrder = reverseDrawingOrder ? DRAW_ORDER_REVERSE : DRAW_ORDER_FORWARD;
- } else {
- mDrawingOrder = DRAW_ORDER_DEFAULT;
- }
- if (needsPopulate) populate();
- }
- }
-
- void setChildrenDrawingOrderEnabledCompat(boolean enable) {
- if (Build.VERSION.SDK_INT >= 7) {
- if (mSetChildrenDrawingOrderEnabled == null) {
- try {
- mSetChildrenDrawingOrderEnabled = ViewGroup.class.getDeclaredMethod(
- "setChildrenDrawingOrderEnabled", new Class[] { Boolean.TYPE });
- } catch (NoSuchMethodException e) {
- Log.e(TAG, "Can't find setChildrenDrawingOrderEnabled", e);
- }
- }
- try {
- mSetChildrenDrawingOrderEnabled.invoke(this, enable);
- } catch (Exception e) {
- Log.e(TAG, "Error changing children drawing order", e);
- }
- }
- }
-
- @Override
- protected int getChildDrawingOrder(int childCount, int i) {
- final int index = mDrawingOrder == DRAW_ORDER_REVERSE ? childCount - 1 - i : i;
- final int result = ((LayoutParams) mDrawingOrderedChildren.get(index).getLayoutParams()).childIndex;
- return result;
- }
-
- /**
- * Set a separate OnPageChangeListener for internal use by the support library.
- *
- * @param listener Listener to set
- * @return The old listener that was set, if any.
- */
- OnPageChangeListener setInternalPageChangeListener(OnPageChangeListener listener) {
- OnPageChangeListener oldListener = mInternalPageChangeListener;
- mInternalPageChangeListener = listener;
- return oldListener;
- }
-
- /**
- * Returns the number of pages that will be retained to either side of the
- * current page in the view hierarchy in an idle state. Defaults to 1.
- *
- * @return How many pages will be kept offscreen on either side
- * @see #setOffscreenPageLimit(int)
- */
- public int getOffscreenPageLimit() {
- return mOffscreenPageLimit;
- }
-
- /**
- * Set the number of pages that should be retained to either side of the
- * current page in the view hierarchy in an idle state. Pages beyond this
- * limit will be recreated from the adapter when needed.
- *
- *
This is offered as an optimization. If you know in advance the number
- * of pages you will need to support or have lazy-loading mechanisms in place
- * on your pages, tweaking this setting can have benefits in perceived smoothness
- * of paging animations and interaction. If you have a small number of pages (3-4)
- * that you can keep active all at once, less time will be spent in layout for
- * newly created view subtrees as the user pages back and forth.
- *
- *
You should keep this limit low, especially if your pages have complex layouts.
- * This setting defaults to 1.
- *
- * @param limit How many pages will be kept offscreen in an idle state.
- */
- public void setOffscreenPageLimit(int limit) {
- if (limit < DEFAULT_OFFSCREEN_PAGES) {
- Log.w(TAG, "Requested offscreen page limit " + limit + " too small; defaulting to " +
- DEFAULT_OFFSCREEN_PAGES);
- limit = DEFAULT_OFFSCREEN_PAGES;
- }
- if (limit != mOffscreenPageLimit) {
- mOffscreenPageLimit = limit;
- populate();
- }
- }
-
- /**
- * Set the margin between pages.
- *
- * @param marginPixels Distance between adjacent pages in pixels
- * @see #getPageMargin()
- * @see #setPageMarginDrawable(Drawable)
- * @see #setPageMarginDrawable(int)
- */
- public void setPageMargin(int marginPixels) {
- final int oldMargin = mPageMargin;
- mPageMargin = marginPixels;
-
- int spacing = 0;
- if (isOrientationHorizontal()) {
- spacing = getWidth();
- } else {
- spacing = getHeight();
- }
- recomputeScrollPosition(spacing, spacing, spacing, spacing, marginPixels, oldMargin);
-
- requestLayout();
- }
-
- /**
- * Return the margin between pages.
- *
- * @return The size of the margin in pixels
- */
- public int getPageMargin() {
- return mPageMargin;
- }
-
- /**
- * Set a drawable that will be used to fill the margin between pages.
- *
- * @param d Drawable to display between pages
- */
- public void setPageMarginDrawable(Drawable d) {
- mMarginDrawable = d;
- if (d != null) refreshDrawableState();
- setWillNotDraw(d == null);
- invalidate();
- }
-
- /**
- * Set a drawable that will be used to fill the margin between pages.
- *
- * @param resId Resource ID of a drawable to display between pages
- */
- public void setPageMarginDrawable(int resId) {
- setPageMarginDrawable(getContext().getResources().getDrawable(resId));
- }
-
- @Override
- protected boolean verifyDrawable(Drawable who) {
- return super.verifyDrawable(who) || who == mMarginDrawable;
- }
-
- @Override
- protected void drawableStateChanged() {
- super.drawableStateChanged();
- final Drawable d = mMarginDrawable;
- if (d != null && d.isStateful()) {
- d.setState(getDrawableState());
- }
- }
-
- // We want the duration of the page snap animation to be influenced by the distance that
- // the screen has to travel, however, we don't want this duration to be effected in a
- // purely linear fashion. Instead, we use this method to moderate the effect that the distance
- // of travel has on the overall snap duration.
- float distanceInfluenceForSnapDuration(float f) {
- f -= 0.5f; // center the values about 0.
- f *= 0.3f * Math.PI / 2.0f;
- return (float) Math.sin(f);
- }
-
- /**
- * Like {@link View#scrollBy}, but scroll smoothly instead of immediately.
- *
- * @param x the number of pixels to scroll by on the X axis
- * @param y the number of pixels to scroll by on the Y axis
- */
- void smoothScrollTo(int x, int y) {
- smoothScrollTo(x, y, 0);
- }
-
- /**
- * Like {@link View#scrollBy}, but scroll smoothly instead of immediately.
- *
- * @param x the number of pixels to scroll by on the X axis
- * @param y the number of pixels to scroll by on the Y axis
- * @param velocity the velocity associated with a fling, if applicable. (0 otherwise)
- */
- void smoothScrollTo(int x, int y, int velocity) {
- if (getChildCount() == 0) {
- // Nothing to do.
- setScrollingCacheEnabled(false);
- return;
- }
- int sx = getScrollX();
- int sy = getScrollY();
- int dx = x - sx;
- int dy = y - sy;
- if (dx == 0 && dy == 0) {
- completeScroll(false);
- populate();
- setScrollState(SCROLL_STATE_IDLE);
- return;
- }
-
- setScrollingCacheEnabled(true);
- setScrollState(SCROLL_STATE_SETTLING);
-
- final int size = isOrientationHorizontal() ? getClientWidth() : getClientHeight();
- final int halfSize = size / 2;
- final float distanceRatio = Math.min(1f, 1.0f * Math.abs(dx) / size);
- final float distance = halfSize + halfSize *
- distanceInfluenceForSnapDuration(distanceRatio);
-
- int duration = 0;
- velocity = Math.abs(velocity);
- if (velocity > 0) {
- duration = 4 * Math.round(1000 * Math.abs(distance / velocity));
- } else {
- final float pageSize = size * mAdapter.getPageSize(mCurItem);
- final float pageDelta = (float) Math.abs(dx) / (pageSize + mPageMargin);
- duration = (int) ((pageDelta + 1) * 100);
- }
- duration = Math.min(duration, MAX_SETTLE_DURATION);
-
- mScroller.startScroll(sx, sy, dx, dy, duration);
- ViewCompat.postInvalidateOnAnimation(this);
- }
-
- ItemInfo addNewItem(int position, int index) {
- ItemInfo ii = new ItemInfo();
- ii.position = position;
- ii.object = mAdapter.instantiateItem(this, position);
- ii.sizeFactor = mAdapter.getPageSize(position);
- if (index < 0 || index >= mItems.size()) {
- mItems.add(ii);
- } else {
- mItems.add(index, ii);
- }
- return ii;
- }
-
- void dataSetChanged() {
- // This method only gets called if our observer is attached, so mAdapter is non-null.
-
- final int adapterCount = mAdapter.getCount();
- mExpectedAdapterCount = adapterCount;
- boolean needPopulate = mItems.size() < mOffscreenPageLimit * 2 + 1 &&
- mItems.size() < adapterCount;
- int newCurrItem = mCurItem;
-
- boolean isUpdating = false;
- for (int i = 0; i < mItems.size(); i++) {
- final ItemInfo ii = mItems.get(i);
- final int newPos = mAdapter.getItemPosition(ii.object);
-
- if (newPos == PagerAdapter.POSITION_UNCHANGED) {
- continue;
- }
-
- if (newPos == PagerAdapter.POSITION_NONE) {
- mItems.remove(i);
- i--;
-
- if (!isUpdating) {
- mAdapter.startUpdate(this);
- isUpdating = true;
- }
-
- mAdapter.destroyItem(this, ii.position, ii.object);
- needPopulate = true;
-
- if (mCurItem == ii.position) {
- // Keep the current item in the valid range
- newCurrItem = Math.max(0, Math.min(mCurItem, adapterCount - 1));
- needPopulate = true;
- }
- continue;
- }
-
- if (ii.position != newPos) {
- if (ii.position == mCurItem) {
- // Our current item changed position. Follow it.
- newCurrItem = newPos;
- }
-
- ii.position = newPos;
- needPopulate = true;
- }
- }
-
- if (isUpdating) {
- mAdapter.finishUpdate(this);
- }
-
- Collections.sort(mItems, COMPARATOR);
-
- if (needPopulate) {
- // Reset our known page widths; populate will recompute them.
- final int childCount = getChildCount();
- for (int i = 0; i < childCount; i++) {
- final View child = getChildAt(i);
- final LayoutParams lp = (LayoutParams) child.getLayoutParams();
- if (!lp.isDecor) {
- lp.sizeFactor = 0.f;
- }
- }
-
- setCurrentItemInternal(newCurrItem, false, true);
- requestLayout();
- }
- }
-
- void populate() {
- populate(mCurItem);
- }
-
- void populate(int newCurrentItem) {
- ItemInfo oldCurInfo = null;
- int focusDirection = View.FOCUS_FORWARD;
- if (mCurItem != newCurrentItem) {
- if (isOrientationHorizontal()) {
- focusDirection = mCurItem < newCurrentItem ? View.FOCUS_RIGHT : View.FOCUS_LEFT;
- } else {
- focusDirection = mCurItem < newCurrentItem ? View.FOCUS_DOWN : View.FOCUS_UP;
- }
- oldCurInfo = infoForPosition(mCurItem);
- mCurItem = newCurrentItem;
- }
-
- if (mAdapter == null) {
- sortChildDrawingOrder();
- return;
- }
-
- // Bail now if we are waiting to populate. This is to hold off
- // on creating views from the time the user releases their finger to
- // fling to a new position until we have finished the scroll to
- // that position, avoiding glitches from happening at that point.
- if (mPopulatePending) {
- if (DEBUG) Log.i(TAG, "populate is pending, skipping for now...");
- sortChildDrawingOrder();
- return;
- }
-
- // Also, don't populate until we are attached to a window. This is to
- // avoid trying to populate before we have restored our view hierarchy
- // state and conflicting with what is restored.
- if (getWindowToken() == null) {
- return;
- }
-
- mAdapter.startUpdate(this);
-
- final int pageLimit = mOffscreenPageLimit;
- final int startPos = Math.max(0, mCurItem - pageLimit);
- final int N = mAdapter.getCount();
- final int endPos = Math.min(N-1, mCurItem + pageLimit);
-
- if (N != mExpectedAdapterCount) {
- String resName;
- try {
- resName = getResources().getResourceName(getId());
- } catch (Resources.NotFoundException e) {
- resName = Integer.toHexString(getId());
- }
- throw new IllegalStateException("The application's PagerAdapter changed the adapter's" +
- " contents without calling PagerAdapter#notifyDataSetChanged!" +
- " Expected adapter item count: " + mExpectedAdapterCount + ", found: " + N +
- " Pager id: " + resName +
- " Pager class: " + getClass() +
- " Problematic adapter: " + mAdapter.getClass());
- }
-
- // Locate the currently focused item or add it if needed.
- int curIndex = -1;
- ItemInfo curItem = null;
- for (curIndex = 0; curIndex < mItems.size(); curIndex++) {
- final ItemInfo ii = mItems.get(curIndex);
- if (ii.position >= mCurItem) {
- if (ii.position == mCurItem) curItem = ii;
- break;
- }
- }
-
- if (curItem == null && N > 0) {
- curItem = addNewItem(mCurItem, curIndex);
- }
-
- // Fill 3x the available width or up to the number of offscreen
- // pages requested to either side, whichever is larger.
- // If we have no current item we have no work to do.
- if (curItem != null) {
- float extraSizeStart = 0.f;
- int itemIndex = curIndex - 1;
- ItemInfo ii = itemIndex >= 0 ? mItems.get(itemIndex) : null;
- final int paddingStart = isOrientationHorizontal() ? getPaddingLeft() : getPaddingTop();
- final int clientSize = isOrientationHorizontal() ? getClientWidth() : getClientHeight();
- final float startSizeNeeded = clientSize <= 0 ? 0 :
- 2.f - curItem.sizeFactor + (float) paddingStart / (float) clientSize;
- for (int pos = mCurItem - 1; pos >= 0; pos--) {
- if (extraSizeStart >= startSizeNeeded && pos < startPos) {
- if (ii == null) {
- break;
- }
- if (pos == ii.position && !ii.scrolling) {
- mItems.remove(itemIndex);
- mAdapter.destroyItem(this, pos, ii.object);
- if (DEBUG) {
- Log.i(TAG, "populate() - destroyItem() with pos: " + pos +
- " view: " + ((View) ii.object));
- }
- itemIndex--;
- curIndex--;
- ii = itemIndex >= 0 ? mItems.get(itemIndex) : null;
- }
- } else if (ii != null && pos == ii.position) {
- extraSizeStart += ii.sizeFactor;
- itemIndex--;
- ii = itemIndex >= 0 ? mItems.get(itemIndex) : null;
- } else {
- ii = addNewItem(pos, itemIndex + 1);
- extraSizeStart += ii.sizeFactor;
- curIndex++;
- ii = itemIndex >= 0 ? mItems.get(itemIndex) : null;
- }
- }
-
- float extraSizeEnd = curItem.sizeFactor;
- itemIndex = curIndex + 1;
- if (extraSizeEnd < 2.f) {
- ii = itemIndex < mItems.size() ? mItems.get(itemIndex) : null;
- final int paddingEnd = isOrientationHorizontal() ? getPaddingRight() : getPaddingBottom();
- final float endSizeNeeded = clientSize <= 0 ? 0 :
- (float) paddingEnd / (float) clientSize + 2.f;
- for (int pos = mCurItem + 1; pos < N; pos++) {
- if (extraSizeEnd >= endSizeNeeded && pos > endPos) {
- if (ii == null) {
- break;
- }
- if (pos == ii.position && !ii.scrolling) {
- mItems.remove(itemIndex);
- mAdapter.destroyItem(this, pos, ii.object);
- if (DEBUG) {
- Log.i(TAG, "populate() - destroyItem() with pos: " + pos +
- " view: " + ((View) ii.object));
- }
- ii = itemIndex < mItems.size() ? mItems.get(itemIndex) : null;
- }
- } else if (ii != null && pos == ii.position) {
- extraSizeEnd += ii.sizeFactor;
- itemIndex++;
- ii = itemIndex < mItems.size() ? mItems.get(itemIndex) : null;
- } else {
- ii = addNewItem(pos, itemIndex);
- itemIndex++;
- extraSizeEnd += ii.sizeFactor;
- ii = itemIndex < mItems.size() ? mItems.get(itemIndex) : null;
- }
- }
- }
-
- calculatePageOffsets(curItem, curIndex, oldCurInfo);
- }
-
- if (DEBUG) {
- Log.i(TAG, "Current page list:");
- for (int i=0; i();
- } else {
- mDrawingOrderedChildren.clear();
- }
- final int childCount = getChildCount();
- for (int i = 0; i < childCount; i++) {
- final View child = getChildAt(i);
- mDrawingOrderedChildren.add(child);
- }
- Collections.sort(mDrawingOrderedChildren, sPositionComparator);
- }
- }
-
- private void calculatePageOffsets(ItemInfo curItem, int curIndex, ItemInfo oldCurInfo) {
- final int N = mAdapter.getCount();
- final int size = isOrientationHorizontal() ? getClientWidth() : getClientHeight();
- final float marginOffset = size > 0 ? (float) mPageMargin / size : 0;
- // Fix up offsets for later layout.
- if (oldCurInfo != null) {
- final int oldCurPosition = oldCurInfo.position;
- // Base offsets off of oldCurInfo.
- if (oldCurPosition < curItem.position) {
- int itemIndex = 0;
- ItemInfo ii = null;
- float offset = oldCurInfo.offset + oldCurInfo.sizeFactor + marginOffset;
- for (int pos = oldCurPosition + 1;
- pos <= curItem.position && itemIndex < mItems.size(); pos++) {
- ii = mItems.get(itemIndex);
- while (pos > ii.position && itemIndex < mItems.size() - 1) {
- itemIndex++;
- ii = mItems.get(itemIndex);
- }
- while (pos < ii.position) {
- // We don't have an item populated for this,
- // ask the adapter for an offset.
- offset += mAdapter.getPageSize(pos) + marginOffset;
- pos++;
- }
- ii.offset = offset;
- offset += ii.sizeFactor + marginOffset;
- }
- } else if (oldCurPosition > curItem.position) {
- int itemIndex = mItems.size() - 1;
- ItemInfo ii = null;
- float offset = oldCurInfo.offset;
- for (int pos = oldCurPosition - 1;
- pos >= curItem.position && itemIndex >= 0; pos--) {
- ii = mItems.get(itemIndex);
- while (pos < ii.position && itemIndex > 0) {
- itemIndex--;
- ii = mItems.get(itemIndex);
- }
- while (pos > ii.position) {
- // We don't have an item populated for this,
- // ask the adapter for an offset.
- offset -= mAdapter.getPageSize(pos) + marginOffset;
- pos--;
- }
- offset -= ii.sizeFactor + marginOffset;
- ii.offset = offset;
- }
- }
- }
-
- // Base all offsets off of curItem.
- final int itemCount = mItems.size();
- float offset = curItem.offset;
- int pos = curItem.position - 1;
- mFirstOffset = curItem.position == 0 ? curItem.offset : -Float.MAX_VALUE;
- mLastOffset = curItem.position == N - 1 ?
- curItem.offset + curItem.sizeFactor - 1 : Float.MAX_VALUE;
- // Previous pages
- for (int i = curIndex - 1; i >= 0; i--, pos--) {
- final ItemInfo ii = mItems.get(i);
- while (pos > ii.position) {
- offset -= mAdapter.getPageSize(pos--) + marginOffset;
- }
- offset -= ii.sizeFactor + marginOffset;
- ii.offset = offset;
- if (ii.position == 0) mFirstOffset = offset;
- }
- offset = curItem.offset + curItem.sizeFactor + marginOffset;
- pos = curItem.position + 1;
- // Next pages
- for (int i = curIndex + 1; i < itemCount; i++, pos++) {
- final ItemInfo ii = mItems.get(i);
- while (pos < ii.position) {
- offset += mAdapter.getPageSize(pos++) + marginOffset;
- }
- if (ii.position == N - 1) {
- mLastOffset = offset + ii.sizeFactor - 1;
- }
- ii.offset = offset;
- offset += ii.sizeFactor + marginOffset;
- }
-
- mNeedCalculatePageOffsets = false;
- }
-
- /**
- * This is the persistent state that is saved by ViewPager. Only needed
- * if you are creating a sublass of ViewPager that must save its own
- * state, in which case it should implement a subclass of this which
- * contains that state.
- */
- public static class SavedState extends BaseSavedState {
- int position;
- Parcelable adapterState;
- ClassLoader loader;
-
- public SavedState(Parcelable superState) {
- super(superState);
- }
-
- @Override
- public void writeToParcel(Parcel out, int flags) {
- super.writeToParcel(out, flags);
- out.writeInt(position);
- out.writeParcelable(adapterState, flags);
- }
-
- @Override
- public String toString() {
- return "FragmentPager.SavedState{"
- + Integer.toHexString(System.identityHashCode(this))
- + " position=" + position + "}";
- }
-
- public static final Parcelable.Creator CREATOR
- = ParcelableCompat.newCreator(new ParcelableCompatCreatorCallbacks() {
- @Override
- public SavedState createFromParcel(Parcel in, ClassLoader loader) {
- return new SavedState(in, loader);
- }
- @Override
- public SavedState[] newArray(int size) {
- return new SavedState[size];
- }
- });
-
- SavedState(Parcel in, ClassLoader loader) {
- super(in);
- if (loader == null) {
- loader = getClass().getClassLoader();
- }
- position = in.readInt();
- adapterState = in.readParcelable(loader);
- this.loader = loader;
- }
- }
-
- @Override
- public Parcelable onSaveInstanceState() {
- Parcelable superState = super.onSaveInstanceState();
- SavedState ss = new SavedState(superState);
- ss.position = mCurItem;
- if (mAdapter != null) {
- ss.adapterState = mAdapter.saveState();
- }
- return ss;
- }
-
- @Override
- public void onRestoreInstanceState(Parcelable state) {
- if (!(state instanceof SavedState)) {
- super.onRestoreInstanceState(state);
- return;
- }
-
- SavedState ss = (SavedState)state;
- super.onRestoreInstanceState(ss.getSuperState());
-
- if (mAdapter != null) {
- mAdapter.restoreState(ss.adapterState, ss.loader);
- setCurrentItemInternal(ss.position, false, true);
- } else {
- mRestoredCurItem = ss.position;
- mRestoredAdapterState = ss.adapterState;
- mRestoredClassLoader = ss.loader;
- }
- }
-
- @Override
- public void addView(View child, int index, ViewGroup.LayoutParams params) {
- if (!checkLayoutParams(params)) {
- params = generateLayoutParams(params);
- }
- final LayoutParams lp = (LayoutParams) params;
- lp.isDecor |= child instanceof Decor;
- if (mInLayout) {
- if (lp != null && lp.isDecor) {
- throw new IllegalStateException("Cannot add pager decor view during layout");
- }
- lp.needsMeasure = true;
- addViewInLayout(child, index, params);
- } else {
- super.addView(child, index, params);
- }
-
- if (USE_CACHE) {
- if (child.getVisibility() != GONE) {
- child.setDrawingCacheEnabled(mScrollingCacheEnabled);
- } else {
- child.setDrawingCacheEnabled(false);
- }
- }
- }
-
- @Override
- public void removeView(View view) {
- if (mInLayout) {
- removeViewInLayout(view);
- } else {
- super.removeView(view);
- }
- }
-
- ItemInfo infoForChild(View child) {
- for (int i=0; i 0 && !mItems.isEmpty()) {
- final int paddingStart = isOrientationHorizontal() ? getPaddingLeft() : getPaddingTop();
- final int paddingEnd = isOrientationHorizontal() ? getPaddingRight()
- : getPaddingBottom();
- final int sizeWithMargin = size - paddingStart - paddingEnd + margin;
- final int oldSizeWithMargin = oldSize - paddingStart - paddingEnd + oldMargin;
- final int xPos = getScrollX();
- final int yPos = getScrollY();
-
- final float pageOffset = (float) (isOrientationHorizontal() ? xPos : yPos) / oldSizeWithMargin;
- final int newXOffsetPixels = isOrientationHorizontal() ? (int) (pageOffset * sizeWithMargin) : xPos;
- final int newYOffsetPixels = isOrientationHorizontal() ? yPos : (int) (pageOffset * sizeWithMargin);
-
- scrollTo(newXOffsetPixels, newYOffsetPixels);
- if (!mScroller.isFinished()) {
- // We now return to your regularly schedules scroll, already in progress.
- final int newDuration = mScroller.getDuration() - mScroller.timePassed();
- ItemInfo targetInfo = infoForPosition(mCurItem);
- if (isOrientationHorizontal()) {
- mScroller.startScroll(newXOffsetPixels, 0,
- (int) (targetInfo.offset * size), 0, newDuration);
- } else {
- mScroller.startScroll(0, newYOffsetPixels,
- (int) (targetInfo.offset * size), 0, newDuration);
- }
- }
- }
- }
-
- @Override
- protected void onLayout(boolean changed, int l, int t, int r, int b) {
- final int count = getChildCount();
- int width = r - l;
- int height = b - t;
- int paddingLeft = getPaddingLeft();
- int paddingTop = getPaddingTop();
- int paddingRight = getPaddingRight();
- int paddingBottom = getPaddingBottom();
- final int scrollX = getScrollX();
- final int scrollY = getScrollY();
-
- int decorCount = 0;
-
- // First pass - decor views. We need to do this in two passes so that
- // we have the proper offsets for non-decor views later.
- for (int i = 0; i < count; i++) {
- final View child = getChildAt(i);
- if (child.getVisibility() != GONE) {
- final LayoutParams lp = (LayoutParams) child.getLayoutParams();
- int childLeft = 0;
- int childTop = 0;
- if (lp.isDecor) {
- final int hgrav = lp.gravity & Gravity.HORIZONTAL_GRAVITY_MASK;
- final int vgrav = lp.gravity & Gravity.VERTICAL_GRAVITY_MASK;
- switch (hgrav) {
- default:
- childLeft = paddingLeft;
- break;
- case Gravity.LEFT:
- childLeft = paddingLeft;
- paddingLeft += child.getMeasuredWidth();
- break;
- case Gravity.CENTER_HORIZONTAL:
- childLeft = Math.max((width - child.getMeasuredWidth()) / 2,
- paddingLeft);
- break;
- case Gravity.RIGHT:
- childLeft = width - paddingRight - child.getMeasuredWidth();
- paddingRight += child.getMeasuredWidth();
- break;
- }
- switch (vgrav) {
- default:
- childTop = paddingTop;
- break;
- case Gravity.TOP:
- childTop = paddingTop;
- paddingTop += child.getMeasuredHeight();
- break;
- case Gravity.CENTER_VERTICAL:
- childTop = Math.max((height - child.getMeasuredHeight()) / 2,
- paddingTop);
- break;
- case Gravity.BOTTOM:
- childTop = height - paddingBottom - child.getMeasuredHeight();
- paddingBottom += child.getMeasuredHeight();
- break;
- }
- if (isOrientationHorizontal()) {
- childLeft += scrollX;
- } else {
- childTop += scrollY;
- }
- child.layout(childLeft, childTop,
- childLeft + child.getMeasuredWidth(),
- childTop + child.getMeasuredHeight());
- decorCount++;
- }
- }
- }
-
- int childSize = 0;
- if (isOrientationHorizontal()) {
- childSize = width - paddingLeft - paddingRight;
- } else {
- childSize = height - paddingTop - paddingBottom;
- }
- // Page views. Do this once we have the right padding offsets from above.
- for (int i = 0; i < count; i++) {
- final View child = getChildAt(i);
- if (child.getVisibility() != GONE) {
- final LayoutParams lp = (LayoutParams) child.getLayoutParams();
- ItemInfo ii;
- if (!lp.isDecor && (ii = infoForChild(child)) != null) {
- int loff = (int) (childSize * ii.offset);
- int childLeft = paddingLeft + (isOrientationHorizontal() ? loff : 0);
- int childTop = paddingTop + (isOrientationHorizontal() ? 0 : loff);
- if (lp.needsMeasure) {
- // This was added during layout and needs measurement.
- // Do it now that we know what we're working with.
- lp.needsMeasure = false;
- int widthSpec = 0, heightSpec = 0;
- if (isOrientationHorizontal()) {
- widthSpec = MeasureSpec.makeMeasureSpec(
- (int) (childSize * lp.sizeFactor),
- MeasureSpec.EXACTLY);
- heightSpec = MeasureSpec.makeMeasureSpec(
- (int) (height - paddingTop - paddingBottom),
- MeasureSpec.EXACTLY);
- } else {
- widthSpec = MeasureSpec.makeMeasureSpec(
- (int) (width - paddingLeft - paddingRight),
- MeasureSpec.EXACTLY);
- heightSpec = MeasureSpec.makeMeasureSpec(
- (int) (childSize * lp.sizeFactor),
- MeasureSpec.EXACTLY);
- }
- child.measure(widthSpec, heightSpec);
- }
- if (DEBUG) Log.v(TAG, "Positioning #" + i + " " + child + " f=" + ii.object
- + ":" + childLeft + "," + childTop + " " + child.getMeasuredWidth()
- + "x" + child.getMeasuredHeight());
- child.layout(childLeft, childTop,
- childLeft + child.getMeasuredWidth(),
- childTop + child.getMeasuredHeight());
- }
- }
- }
- mLeftPageBounds = paddingLeft;
- mTopPageBounds = paddingTop;
- mRightPageBounds = width - paddingRight;
- mBottomPageBounds = height - paddingBottom;
- mDecorChildCount = decorCount;
-
- if (mFirstLayout) {
- scrollToItem(mCurItem, false, 0, false);
- }
- mFirstLayout = false;
- }
-
- @Override
- public void computeScroll() {
- if (!mScroller.isFinished() && mScroller.computeScrollOffset()) {
- int oldX = getScrollX();
- int oldY = getScrollY();
- int x = mScroller.getCurrX();
- int y = mScroller.getCurrY();
-
- if (oldX != x || oldY != y) {
- scrollTo(x, y);
- if (!pageScrolled(isOrientationHorizontal() ? x : y)) {
- mScroller.abortAnimation();
- if (isOrientationHorizontal()) {
- scrollTo(0, y);
- } else {
- scrollTo(x, 0);
- }
- }
- }
-
- // Keep on drawing until the animation has finished.
- ViewCompat.postInvalidateOnAnimation(this);
- return;
- }
-
- // Done with scroll, clean up state.
- completeScroll(true);
- }
-
- private boolean pageScrolled(int pos) {
- if (mItems.size() == 0) {
- mCalledSuper = false;
- onPageScrolled(0, 0, 0);
- if (!mCalledSuper) {
- throw new IllegalStateException(
- "onPageScrolled did not call superclass implementation");
- }
- return false;
- }
- final ItemInfo ii = infoForCurrentScrollPosition();
- final int size = isOrientationHorizontal() ? getClientWidth() : getClientHeight();
- final int sizeWithMargin = size + mPageMargin;
- final float marginOffset = (float) mPageMargin / size;
- final int currentPage = ii.position;
- final float pageOffset = (((float) pos / size) - ii.offset) /
- (ii.sizeFactor + marginOffset);
- final int offsetPixels = (int) (pageOffset * sizeWithMargin);
-
- mCalledSuper = false;
- onPageScrolled(currentPage, pageOffset, offsetPixels);
- if (!mCalledSuper) {
- throw new IllegalStateException(
- "onPageScrolled did not call superclass implementation");
- }
- return true;
- }
-
- /**
- * This method will be invoked when the current page is scrolled, either as part
- * of a programmatically initiated smooth scroll or a user initiated touch scroll.
- * If you override this method you must call through to the superclass implementation
- * (e.g. super.onPageScrolled(position, offset, offsetPixels)) before onPageScrolled
- * returns.
- *
- * @param position Position index of the first page currently being displayed.
- * Page position+1 will be visible if positionOffset is nonzero.
- * @param offset Value from [0, 1) indicating the offset from the page at position.
- * @param offsetPixels Value in pixels indicating the offset from position.
- */
- protected void onPageScrolled(int position, float offset, int offsetPixels) {
- // Offset any decor views if needed - keep them on-screen at all times.
- if (mDecorChildCount > 0) {
- // TODO This is where I start getting tired. Refactor this better later.
- if (isOrientationHorizontal()) {
- final int scrollX = getScrollX();
- int paddingLeft = getPaddingLeft();
- int paddingRight = getPaddingRight();
- final int width = getWidth();
- final int childCount = getChildCount();
- for (int i = 0; i < childCount; i++) {
- final View child = getChildAt(i);
- final LayoutParams lp = (LayoutParams) child.getLayoutParams();
- if (!lp.isDecor) continue;
-
- final int hgrav = lp.gravity & Gravity.HORIZONTAL_GRAVITY_MASK;
- int childLeft = 0;
- switch (hgrav) {
- default:
- childLeft = paddingLeft;
- break;
- case Gravity.LEFT:
- childLeft = paddingLeft;
- paddingLeft += child.getWidth();
- break;
- case Gravity.CENTER_HORIZONTAL:
- childLeft = Math.max((width - child.getMeasuredWidth()) / 2,
- paddingLeft);
- break;
- case Gravity.RIGHT:
- childLeft = width - paddingRight - child.getMeasuredWidth();
- paddingRight += child.getMeasuredWidth();
- break;
- }
- childLeft += scrollX;
-
- final int childOffset = childLeft - child.getLeft();
- if (childOffset != 0) {
- child.offsetLeftAndRight(childOffset);
- }
- }
- } else {
- final int scrollY = getScrollY();
- int paddingTop = getPaddingTop();
- int paddingBottom = getPaddingBottom();
- final int height = getHeight();
- final int childCount = getChildCount();
- for (int i = 0; i < childCount; i++) {
- final View child = getChildAt(i);
- final LayoutParams lp = (LayoutParams) child.getLayoutParams();
- if (!lp.isDecor) continue;
-
- final int vgrav = lp.gravity & Gravity.VERTICAL_GRAVITY_MASK;
- int childTop = 0;
- switch (vgrav) {
- default:
- childTop = paddingTop;
- break;
- case Gravity.TOP:
- childTop = paddingTop;
- paddingTop += child.getHeight();
- break;
- case Gravity.CENTER_VERTICAL:
- childTop = Math.max((height - child.getMeasuredHeight()) / 2,
- paddingTop);
- break;
- case Gravity.BOTTOM:
- childTop = height - paddingBottom - child.getMeasuredHeight();
- paddingBottom += child.getMeasuredHeight();
- break;
- }
- childTop += scrollY;
-
- final int childOffset = childTop - child.getTop();
- if (childOffset != 0) {
- child.offsetTopAndBottom(childOffset);
- }
- }
- }
- }
-
- if (mOnPageChangeListener != null) {
- mOnPageChangeListener.onPageScrolled(position, offset, offsetPixels);
- }
- if (mInternalPageChangeListener != null) {
- mInternalPageChangeListener.onPageScrolled(position, offset, offsetPixels);
- }
-
- if (mPageTransformer != null) {
- final boolean horizontal = isOrientationHorizontal();
- final int scroll = horizontal ? getScrollX() : getScrollY();
- final int childCount = getChildCount();
- for (int i = 0; i < childCount; i++) {
- final View child = getChildAt(i);
- final LayoutParams lp = (LayoutParams) child.getLayoutParams();
-
- if (lp.isDecor) continue;
-
- float transformPos;
- if (horizontal) {
- transformPos = (float) (child.getLeft() - scroll) / getClientWidth();
- } else {
- transformPos = (float) (child.getTop() - scroll) / getClientHeight();
- }
- mPageTransformer.transformPage(child, transformPos);
- }
- }
-
- mCalledSuper = true;
- }
-
- private void completeScroll(boolean postEvents) {
- boolean needPopulate = mScrollState == SCROLL_STATE_SETTLING;
- if (needPopulate) {
- // Done with scroll, no longer want to cache view drawing.
- setScrollingCacheEnabled(false);
- mScroller.abortAnimation();
- int oldX = getScrollX();
- int oldY = getScrollY();
- int x = mScroller.getCurrX();
- int y = mScroller.getCurrY();
- if (oldX != x || oldY != y) {
- scrollTo(x, y);
- }
- }
- mPopulatePending = false;
- for (int i=0; i 0) || (x > getWidth() - mGutterSize && dx < 0);
- } else {
- return (x < mGutterSize && dx > 0) || (x > getHeight() - mGutterSize && dx < 0);
- }
- }
-
- private void enableLayers(boolean enable) {
- final int childCount = getChildCount();
- for (int i = 0; i < childCount; i++) {
- final int layerType = enable ?
- ViewCompat.LAYER_TYPE_HARDWARE : ViewCompat.LAYER_TYPE_NONE;
- ViewCompat.setLayerType(getChildAt(i), layerType, null);
- }
- }
-
- @Override
- public boolean onInterceptTouchEvent(MotionEvent ev) {
- /*
- * This method JUST determines whether we want to intercept the motion.
- * If we return true, onMotionEvent will be called and we do the actual
- * scrolling there.
- */
-
- final int action = ev.getAction() & MotionEventCompat.ACTION_MASK;
-
- // Always take care of the touch gesture being complete.
- if (action == MotionEvent.ACTION_CANCEL || action == MotionEvent.ACTION_UP) {
- // Release the drag.
- if (DEBUG) Log.v(TAG, "Intercept done!");
- mIsBeingDragged = false;
- mIsUnableToDrag = false;
- mActivePointerId = INVALID_POINTER;
- if (mVelocityTracker != null) {
- mVelocityTracker.recycle();
- mVelocityTracker = null;
- }
- return false;
- }
-
- // Nothing more to do here if we have decided whether or not we
- // are dragging.
- if (action != MotionEvent.ACTION_DOWN) {
- if (mIsBeingDragged) {
- if (DEBUG) Log.v(TAG, "Intercept returning true!");
- return true;
- }
- if (mIsUnableToDrag) {
- if (DEBUG) Log.v(TAG, "Intercept returning false!");
- return false;
- }
- }
-
- switch (action) {
- case MotionEvent.ACTION_MOVE: {
- /*
- * mIsBeingDragged == false, otherwise the shortcut would have caught it. Check
- * whether the user has moved far enough from his original down touch.
- */
-
- /*
- * Locally do absolute value. mLastMotionY is set to the y value
- * of the down event.
- */
- final int activePointerId = mActivePointerId;
- if (activePointerId == INVALID_POINTER) {
- // If we don't have a valid id, the touch down wasn't on content.
- break;
- }
-
- final int pointerIndex = MotionEventCompat.findPointerIndex(ev, activePointerId);
- final float x = MotionEventCompat.getX(ev, pointerIndex);
- final float dx = x - mLastMotionX;
- final float xDiff = Math.abs(dx);
- final float y = MotionEventCompat.getY(ev, pointerIndex);
- final float dy = y - mLastMotionY;
- final float yDiff = Math.abs(y - mInitialMotionY);
- if (DEBUG) Log.v(TAG, "Moved x to " + x + "," + y + " diff=" + xDiff + "," + yDiff);
-
- if (isOrientationHorizontal()) {
- if (dx != 0 && !isGutterDrag(mLastMotionX, dx) &&
- canScroll(this, false, (int) dx, (int) x, (int) y)) {
- // Nested view has scrollable area under this point. Let it be handled there.
- mLastMotionX = x;
- mLastMotionY = y;
- mIsUnableToDrag = true;
- return false;
- }
- if (xDiff > mTouchSlop && xDiff * 0.5f > yDiff) {
- if (DEBUG) Log.v(TAG, "Starting drag!");
- mIsBeingDragged = true;
- setScrollState(SCROLL_STATE_DRAGGING);
- mLastMotionX = dx > 0 ? mInitialMotionX + mTouchSlop :
- mInitialMotionX - mTouchSlop;
- mLastMotionY = y;
- setScrollingCacheEnabled(true);
- } else if (yDiff > mTouchSlop) {
- // The finger has moved enough in the vertical
- // direction to be counted as a drag... abort
- // any attempt to drag horizontally, to work correctly
- // with children that have scrolling containers.
- if (DEBUG) Log.v(TAG, "Starting unable to drag!");
- mIsUnableToDrag = true;
- }
- if (mIsBeingDragged) {
- // Scroll to follow the motion event
- if (performDrag(x)) {
- ViewCompat.postInvalidateOnAnimation(this);
- }
- }
- } else {
- if (dy != 0 && !isGutterDrag(mLastMotionY, dy) &&
- canScroll(this, false, (int) dx, (int) x, (int) y)) {
- // Nested view has scrollable area under this point. Let it be handled there.
- mLastMotionX = x;
- mLastMotionY = y;
- mIsUnableToDrag = true;
- return false;
- }
- if (yDiff > mTouchSlop && yDiff * 0.5f > xDiff) {
- if (DEBUG) Log.v(TAG, "Starting drag!");
- mIsBeingDragged = true;
- setScrollState(SCROLL_STATE_DRAGGING);
- mLastMotionY = dy > 0 ? mInitialMotionY + mTouchSlop :
- mInitialMotionY - mTouchSlop;
- mLastMotionX = x;
- setScrollingCacheEnabled(true);
- } else if (xDiff > mTouchSlop) {
- // The finger has moved enough in the vertical
- // direction to be counted as a drag... abort
- // any attempt to drag horizontally, to work correctly
- // with children that have scrolling containers.
- if (DEBUG) Log.v(TAG, "Starting unable to drag!");
- mIsUnableToDrag = true;
- }
- if (mIsBeingDragged) {
- // Scroll to follow the motion event
- if (performDrag(y)) {
- ViewCompat.postInvalidateOnAnimation(this);
- }
- }
- }
- break;
- }
-
- case MotionEvent.ACTION_DOWN: {
- /*
- * Remember location of down touch.
- * ACTION_DOWN always refers to pointer index 0.
- */
- mLastMotionX = mInitialMotionX = ev.getX();
- mLastMotionY = mInitialMotionY = ev.getY();
- mActivePointerId = MotionEventCompat.getPointerId(ev, 0);
- mIsUnableToDrag = false;
-
- mScroller.computeScrollOffset();
- int distance = 0;
- if (isOrientationHorizontal()) {
- distance = Math.abs(mScroller.getFinalX() - mScroller.getCurrX());
- } else {
- distance = Math.abs(mScroller.getFinalY() - mScroller.getCurrY());
- }
- if (mScrollState == SCROLL_STATE_SETTLING && distance > mCloseEnough) {
- // Let the user 'catch' the pager as it animates.
- mScroller.abortAnimation();
- mPopulatePending = false;
- populate();
- mIsBeingDragged = true;
- setScrollState(SCROLL_STATE_DRAGGING);
- } else {
- completeScroll(false);
- mIsBeingDragged = false;
- }
-
- if (DEBUG) Log.v(TAG, "Down at " + mLastMotionX + "," + mLastMotionY
- + " mIsBeingDragged=" + mIsBeingDragged
- + "mIsUnableToDrag=" + mIsUnableToDrag);
- break;
- }
-
- case MotionEventCompat.ACTION_POINTER_UP:
- onSecondaryPointerUp(ev);
- break;
- }
-
- if (mVelocityTracker == null) {
- mVelocityTracker = VelocityTracker.obtain();
- }
- mVelocityTracker.addMovement(ev);
-
- /*
- * The only time we want to intercept motion events is if we are in the
- * drag mode.
- */
- return mIsBeingDragged;
- }
-
- @Override
- public boolean onTouchEvent(MotionEvent ev) {
- if (mFakeDragging) {
- // A fake drag is in progress already, ignore this real one
- // but still eat the touch events.
- // (It is likely that the user is multi-touching the screen.)
- return true;
- }
-
- if (ev.getAction() == MotionEvent.ACTION_DOWN && ev.getEdgeFlags() != 0) {
- // Don't handle edge touches immediately -- they may actually belong to one of our
- // descendants.
- return false;
- }
-
- if (mAdapter == null || mAdapter.getCount() == 0) {
- // Nothing to present or scroll; nothing to touch.
- return false;
- }
-
- if (mVelocityTracker == null) {
- mVelocityTracker = VelocityTracker.obtain();
- }
- mVelocityTracker.addMovement(ev);
-
- final int action = ev.getAction();
- boolean needsInvalidate = false;
-
- switch (action & MotionEventCompat.ACTION_MASK) {
- case MotionEvent.ACTION_DOWN: {
- mScroller.abortAnimation();
- mPopulatePending = false;
- populate();
- mIsBeingDragged = true;
- setScrollState(SCROLL_STATE_DRAGGING);
-
- // Remember where the motion event started
- mLastMotionX = mInitialMotionX = ev.getX();
- mLastMotionY = mInitialMotionY = ev.getY();
- mActivePointerId = MotionEventCompat.getPointerId(ev, 0);
- break;
- }
- case MotionEvent.ACTION_MOVE:
- if (!mIsBeingDragged) {
- final int pointerIndex = MotionEventCompat.findPointerIndex(ev, mActivePointerId);
- final float x = MotionEventCompat.getX(ev, pointerIndex);
- final float xDiff = Math.abs(x - mLastMotionX);
- final float y = MotionEventCompat.getY(ev, pointerIndex);
- final float yDiff = Math.abs(y - mLastMotionY);
- if (DEBUG) Log.v(TAG, "Moved x to " + x + "," + y + " diff=" + xDiff + "," + yDiff);
- if (isOrientationHorizontal()) {
- if (xDiff > mTouchSlop && xDiff > yDiff) {
- if (DEBUG) Log.v(TAG, "Starting drag!");
- mIsBeingDragged = true;
- mLastMotionX = x - mInitialMotionX > 0 ? mInitialMotionX + mTouchSlop :
- mInitialMotionX - mTouchSlop;
- mLastMotionY = y;
- setScrollState(SCROLL_STATE_DRAGGING);
- setScrollingCacheEnabled(true);
- }
- } else {
- if (yDiff > mTouchSlop && yDiff > xDiff) {
- if (DEBUG) Log.v(TAG, "Starting drag!");
- mIsBeingDragged = true;
- mLastMotionY = y - mInitialMotionY > 0 ? mInitialMotionY + mTouchSlop :
- mInitialMotionY - mTouchSlop;
- mLastMotionX = x;
- setScrollState(SCROLL_STATE_DRAGGING);
- setScrollingCacheEnabled(true);
- }
- }
- }
- // Not else! Note that mIsBeingDragged can be set above.
- if (mIsBeingDragged) {
- // Scroll to follow the motion event
- final int activePointerIndex = MotionEventCompat.findPointerIndex(
- ev, mActivePointerId);
- float x = 0;
- if (isOrientationHorizontal()) {
- x = MotionEventCompat.getX(ev, activePointerIndex);
- } else {
- x = MotionEventCompat.getY(ev, activePointerIndex);
- }
- needsInvalidate |= performDrag(x);
- }
- break;
- case MotionEvent.ACTION_UP:
- if (mIsBeingDragged) {
- final VelocityTracker velocityTracker = mVelocityTracker;
- velocityTracker.computeCurrentVelocity(1000, mMaximumVelocity);
- mPopulatePending = true;
- final ItemInfo ii = infoForCurrentScrollPosition();
- final int currentPage = ii.position;
-
- int initialVelocity, totalDelta;
- float pageOffset;
- if (isOrientationHorizontal()) {
- initialVelocity = (int) VelocityTrackerCompat.getXVelocity(
- velocityTracker, mActivePointerId);
- final int width = getClientWidth();
- final int scrollX = getScrollX();
- pageOffset = (((float) scrollX / width) - ii.offset) / ii.sizeFactor;
- final int activePointerIndex =
- MotionEventCompat.findPointerIndex(ev, mActivePointerId);
- final float x = MotionEventCompat.getX(ev, activePointerIndex);
- totalDelta = (int) (x - mInitialMotionX);
- } else {
- initialVelocity = (int) VelocityTrackerCompat.getYVelocity(
- velocityTracker, mActivePointerId);
- final int height = getClientHeight();
- final int scrollY = getScrollY();
- pageOffset = (((float) scrollY / height) - ii.offset) / ii.sizeFactor;
- final int activePointerIndex =
- MotionEventCompat.findPointerIndex(ev, mActivePointerId);
- final float y = MotionEventCompat.getY(ev, activePointerIndex);
- totalDelta = (int) (y - mInitialMotionY);
- }
-
- int nextPage = determineTargetPage(currentPage, pageOffset, initialVelocity,
- totalDelta);
- setCurrentItemInternal(nextPage, true, true, initialVelocity);
-
- mActivePointerId = INVALID_POINTER;
- endDrag();
- needsInvalidate = mLeftEdge.onRelease() | mRightEdge.onRelease();
- }
- break;
- case MotionEvent.ACTION_CANCEL:
- if (mIsBeingDragged) {
- scrollToItem(mCurItem, true, 0, false);
- mActivePointerId = INVALID_POINTER;
- endDrag();
- needsInvalidate = mLeftEdge.onRelease() | mRightEdge.onRelease();
- }
- break;
- case MotionEventCompat.ACTION_POINTER_DOWN: {
- final int index = MotionEventCompat.getActionIndex(ev);
- final float x = MotionEventCompat.getX(ev, index);
- final float y = MotionEventCompat.getY(ev, index);
- mLastMotionX = x;
- mLastMotionY = y;
- mActivePointerId = MotionEventCompat.getPointerId(ev, index);
- break;
- }
- case MotionEventCompat.ACTION_POINTER_UP:
- onSecondaryPointerUp(ev);
- mLastMotionX = MotionEventCompat.getX(ev,
- MotionEventCompat.findPointerIndex(ev, mActivePointerId));
- mLastMotionY = MotionEventCompat.getY(ev,
- MotionEventCompat.findPointerIndex(ev, mActivePointerId));
- break;
- }
- if (needsInvalidate) {
- ViewCompat.postInvalidateOnAnimation(this);
- }
- return true;
- }
-
- private boolean performDrag(float pos) {
- boolean needsInvalidate = false;
-
- if (isOrientationHorizontal()) {
- final float deltaX = mLastMotionX - pos;
- mLastMotionX = pos;
-
- float oldScrollX = getScrollX();
- float scrollX = oldScrollX + deltaX;
- final int width = getClientWidth();
-
- float leftBound = width * mFirstOffset;
- float rightBound = width * mLastOffset;
- boolean leftAbsolute = true;
- boolean rightAbsolute = true;
-
- final ItemInfo firstItem = mItems.get(0);
- final ItemInfo lastItem = mItems.get(mItems.size() - 1);
- if (firstItem.position != 0) {
- leftAbsolute = false;
- leftBound = firstItem.offset * width;
- }
- if (lastItem.position != mAdapter.getCount() - 1) {
- rightAbsolute = false;
- rightBound = lastItem.offset * width;
- }
-
- if (scrollX < leftBound) {
- if (leftAbsolute) {
- float over = leftBound - scrollX;
- needsInvalidate = mLeftEdge.onPull(Math.abs(over) / width);
- }
- scrollX = leftBound;
- } else if (scrollX > rightBound) {
- if (rightAbsolute) {
- float over = scrollX - rightBound;
- needsInvalidate = mRightEdge.onPull(Math.abs(over) / width);
- }
- scrollX = rightBound;
- }
- // Don't lose the rounded component
- mLastMotionX += scrollX - (int) scrollX;
- scrollTo((int) scrollX, getScrollY());
- pageScrolled((int) scrollX);
- } else {
- final float deltaY = mLastMotionY - pos;
- mLastMotionY = pos;
-
- float oldScrollY = getScrollY();
- float scrollY = oldScrollY + deltaY;
- final int height = getClientHeight();
-
- float topBound = height * mFirstOffset;
- float bottomBound = height * mLastOffset;
- boolean topAbsolute = true;
- boolean bottomAbsolute = true;
-
- final ItemInfo firstItem = mItems.get(0);
- final ItemInfo lastItem = mItems.get(mItems.size() - 1);
- if (firstItem.position != 0) {
- topAbsolute = false;
- topBound = firstItem.offset * height;
- }
- if (lastItem.position != mAdapter.getCount() - 1) {
- bottomAbsolute = false;
- bottomBound = lastItem.offset * height;
- }
-
- if (scrollY < topBound) {
- if (topAbsolute) {
- float over = topBound - scrollY;
- needsInvalidate = mLeftEdge.onPull(Math.abs(over) / height);
- }
- scrollY = topBound;
- } else if (scrollY > bottomBound) {
- if (bottomAbsolute) {
- float over = scrollY - bottomBound;
- needsInvalidate = mRightEdge.onPull(Math.abs(over) / height);
- }
- scrollY = bottomBound;
- }
- // Don't lose the rounded component
- mLastMotionX += scrollY - (int) scrollY;
- scrollTo(getScrollX(), (int) scrollY);
- pageScrolled((int) scrollY);
- }
-
- return needsInvalidate;
- }
-
- /**
- * @return Info about the page at the current scroll position.
- * This can be synthetic for a missing middle page; the 'object' field can be null.
- */
- private ItemInfo infoForCurrentScrollPosition() {
- final int scroll = isOrientationHorizontal() ? getScrollX() : getScrollY();
- final int size = isOrientationHorizontal() ? getClientWidth() : getClientHeight();
- final float scrollOffset = size > 0 ? (float) scroll / size : 0;
- final float marginOffset = size > 0 ? (float) mPageMargin / size : 0;
- int lastPos = -1;
- float lastOffset = 0.f;
- float lastSize = 0.f;
- boolean first = true;
-
- ItemInfo lastItem = null;
- for (int i = 0; i < mItems.size(); i++) {
- ItemInfo ii = mItems.get(i);
- float offset;
- if (!first && ii.position != lastPos + 1) {
- // Create a synthetic item for a missing page.
- ii = mTempItem;
- ii.offset = lastOffset + lastSize + marginOffset;
- ii.position = lastPos + 1;
- ii.sizeFactor = mAdapter.getPageSize(ii.position);
- i--;
- }
- offset = ii.offset;
-
- final float startBound = offset;
- final float endBound = offset + ii.sizeFactor + marginOffset;
- if (first || scrollOffset >= startBound) {
- if (scrollOffset < endBound || i == mItems.size() - 1) {
- return ii;
- }
- } else {
- return lastItem;
- }
- first = false;
- lastPos = ii.position;
- lastOffset = offset;
- lastSize = ii.sizeFactor;
- lastItem = ii;
- }
-
- return lastItem;
- }
-
- private int determineTargetPage(int currentPage, float pageOffset, int velocity, int delta) {
- int targetPage;
- if (Math.abs(delta) > mFlingDistance && Math.abs(velocity) > mMinimumVelocity) {
- targetPage = velocity > 0 ? currentPage : currentPage + 1;
- } else {
- final float truncator = currentPage >= mCurItem ? 0.4f : 0.6f;
- targetPage = (int) (currentPage + pageOffset + truncator);
- }
-
- if (mItems.size() > 0) {
- final ItemInfo firstItem = mItems.get(0);
- final ItemInfo lastItem = mItems.get(mItems.size() - 1);
-
- // Only let the user target pages we have items for
- targetPage = Math.max(firstItem.position, Math.min(targetPage, lastItem.position));
- }
-
- return targetPage;
- }
-
- @Override
- public void draw(Canvas canvas) {
- super.draw(canvas);
- boolean needsInvalidate = false;
-
- final int overScrollMode = ViewCompat.getOverScrollMode(this);
- if (overScrollMode == ViewCompat.OVER_SCROLL_ALWAYS ||
- (overScrollMode == ViewCompat.OVER_SCROLL_IF_CONTENT_SCROLLS &&
- mAdapter != null && mAdapter.getCount() > 1)) {
- if (!mLeftEdge.isFinished()) {
- final int restoreCount = canvas.save();
- final int width = isOrientationHorizontal()
- ? getHeight() - getPaddingTop() - getPaddingBottom()
- : getWidth() - getPaddingLeft() - getPaddingRight();
- final int height = isOrientationHorizontal()
- ? getWidth() - getPaddingLeft() - getPaddingRight()
- : getHeight() - getPaddingTop() - getPaddingBottom();
-
- if (isOrientationHorizontal()) {
- canvas.rotate(270);
- canvas.translate(-width + getPaddingTop(), mFirstOffset * height);
- }
- mLeftEdge.setSize(width, height);
- needsInvalidate |= mLeftEdge.draw(canvas);
- canvas.restoreToCount(restoreCount);
- }
- if (!mRightEdge.isFinished()) {
- final int restoreCount = canvas.save();
- final int width = isOrientationHorizontal()
- ? getHeight() - getPaddingTop() - getPaddingBottom()
- : getWidth() - getPaddingLeft() - getPaddingRight();
- final int height = isOrientationHorizontal()
- ? getWidth() - getPaddingLeft() - getPaddingRight()
- : getHeight() - getPaddingTop() - getPaddingBottom();
-
- if (isOrientationHorizontal()) {
- canvas.rotate(90);
- canvas.translate(-getPaddingTop(), -(mLastOffset + 1) * height);
- } else {
- canvas.rotate(180);
- canvas.translate(-width, -(mLastOffset + 1) * height);
- }
- mRightEdge.setSize(width, height);
- needsInvalidate |= mRightEdge.draw(canvas);
- canvas.restoreToCount(restoreCount);
- }
- } else {
- mLeftEdge.finish();
- mRightEdge.finish();
- }
-
- if (needsInvalidate) {
- // Keep animating
- ViewCompat.postInvalidateOnAnimation(this);
- }
- }
-
- @Override
- protected void onDraw(Canvas canvas) {
- super.onDraw(canvas);
-
- // Draw the margin drawable between pages if needed.
- if (mPageMargin > 0 && mMarginDrawable != null && mItems.size() > 0 && mAdapter != null) {
- if (isOrientationHorizontal()) {
- final int scrollX = getScrollX();
- final int width = getWidth();
-
- final float marginOffset = (float) mPageMargin / width;
- int itemIndex = 0;
- ItemInfo ii = mItems.get(0);
- float offset = ii.offset;
- final int itemCount = mItems.size();
- final int firstPos = ii.position;
- final int lastPos = mItems.get(itemCount - 1).position;
- for (int pos = firstPos; pos < lastPos; pos++) {
- while (pos > ii.position && itemIndex < itemCount) {
- ii = mItems.get(++itemIndex);
- }
-
- float drawAt;
- if (pos == ii.position) {
- drawAt = (ii.offset + ii.sizeFactor) * width;
- offset = ii.offset + ii.sizeFactor + marginOffset;
- } else {
- float widthFactor = mAdapter.getPageWidth(pos);
- drawAt = (offset + widthFactor) * width;
- offset += widthFactor + marginOffset;
- }
-
- if (drawAt + mPageMargin > scrollX) {
- mMarginDrawable.setBounds((int) drawAt, mTopPageBounds,
- (int) (drawAt + mPageMargin + 0.5f), mBottomPageBounds);
- mMarginDrawable.draw(canvas);
- }
-
- if (drawAt > scrollX + width) {
- break; // No more visible, no sense in continuing
- }
- }
- } else {
- final int scrollY = getScrollY();
- final int height = getHeight();
-
- final float marginOffset = (float) mPageMargin / height;
- int itemIndex = 0;
- ItemInfo ii = mItems.get(0);
- float offset = ii.offset;
- final int itemCount = mItems.size();
- final int firstPos = ii.position;
- final int lastPos = mItems.get(itemCount - 1).position;
- for (int pos = firstPos; pos < lastPos; pos++) {
- while (pos > ii.position && itemIndex < itemCount) {
- ii = mItems.get(++itemIndex);
- }
-
- float drawAt;
- if (pos == ii.position) {
- drawAt = (ii.offset + ii.sizeFactor) * height;
- offset = ii.offset + ii.sizeFactor + marginOffset;
- } else {
- float sizeFactor = mAdapter.getPageSize(pos);
- drawAt = (offset + sizeFactor) * height;
- offset += sizeFactor + marginOffset;
- }
-
- if (drawAt + mPageMargin > scrollY) {
- mMarginDrawable.setBounds(mLeftPageBounds, (int) drawAt,
- mRightPageBounds, (int) (drawAt + mPageMargin + 0.5f));
- mMarginDrawable.draw(canvas);
- }
-
- if (drawAt > scrollY + height) {
- break; // No more visible, no sense in continuing
- }
- }
- }
- }
- }
-
- /**
- * Start a fake drag of the pager.
- *
- *
A fake drag can be useful if you want to synchronize the motion of the ViewPager
- * with the touch scrolling of another view, while still letting the ViewPager
- * control the snapping motion and fling behavior. (e.g. parallax-scrolling tabs.)
- * Call {@link #fakeDragBy(float)} to simulate the actual drag motion. Call
- * {@link #endFakeDrag()} to complete the fake drag and fling as necessary.
- *
- *
During a fake drag the ViewPager will ignore all touch events. If a real drag
- * is already in progress, this method will return false.
- *
- * @return true if the fake drag began successfully, false if it could not be started.
- *
- * @see #fakeDragBy(float)
- * @see #endFakeDrag()
- */
- public boolean beginFakeDrag() {
- if (mIsBeingDragged) {
- return false;
- }
- mFakeDragging = true;
- setScrollState(SCROLL_STATE_DRAGGING);
- if (isOrientationHorizontal()) {
- mInitialMotionX = mLastMotionX = 0;
- } else {
- mInitialMotionY = mLastMotionY = 0;
- }
- if (mVelocityTracker == null) {
- mVelocityTracker = VelocityTracker.obtain();
- } else {
- mVelocityTracker.clear();
- }
- final long time = SystemClock.uptimeMillis();
- final MotionEvent ev = MotionEvent.obtain(time, time, MotionEvent.ACTION_DOWN, 0, 0, 0);
- mVelocityTracker.addMovement(ev);
- ev.recycle();
- mFakeDragBeginTime = time;
- return true;
- }
-
- /**
- * End a fake drag of the pager.
- *
- * @see #beginFakeDrag()
- * @see #fakeDragBy(float)
- */
- public void endFakeDrag() {
- if (!mFakeDragging) {
- throw new IllegalStateException("No fake drag in progress. Call beginFakeDrag first.");
- }
-
- final VelocityTracker velocityTracker = mVelocityTracker;
- velocityTracker.computeCurrentVelocity(1000, mMaximumVelocity);
-
- final ItemInfo ii = infoForCurrentScrollPosition();
- final int currentPage = ii.position;
-
- int initialVelocity, totalDelta;
- float pageOffset;
- if (isOrientationHorizontal()) {
- initialVelocity = (int) VelocityTrackerCompat.getXVelocity(
- velocityTracker, mActivePointerId);
- mPopulatePending = true;
- final int width = getClientWidth();
- final int scrollX = getScrollX();
- pageOffset = (((float) scrollX / width) - ii.offset) / ii.sizeFactor;
- totalDelta = (int) (mLastMotionX - mInitialMotionX);
- } else {
- initialVelocity = (int) VelocityTrackerCompat.getYVelocity(
- velocityTracker, mActivePointerId);
- mPopulatePending = true;
- final int height = getClientHeight();
- final int scrollY = getScrollY();
- pageOffset = (((float) scrollY / height) - ii.offset) / ii.sizeFactor;
- totalDelta = (int) (mLastMotionY - mInitialMotionY);
- }
-
- int nextPage = determineTargetPage(currentPage, pageOffset, initialVelocity,
- totalDelta);
- setCurrentItemInternal(nextPage, true, true, initialVelocity);
- endDrag();
-
- mFakeDragging = false;
- }
-
- /**
- * Fake drag by an offset in pixels. You must have called {@link #beginFakeDrag()} first.
- *
- * @param offset Offset in pixels to drag by.
- * @see #beginFakeDrag()
- * @see #endFakeDrag()
- */
- public void fakeDragBy(float offset) {
- if (!mFakeDragging) {
- throw new IllegalStateException("No fake drag in progress. Call beginFakeDrag first.");
- }
-
- if (isOrientationHorizontal()) {
- mLastMotionX += offset;
-
- float oldScrollX = getScrollX();
- float scrollX = oldScrollX - offset;
- final int width = getClientWidth();
-
- float leftBound = width * mFirstOffset;
- float rightBound = width * mLastOffset;
-
- final ItemInfo firstItem = mItems.get(0);
- final ItemInfo lastItem = mItems.get(mItems.size() - 1);
- if (firstItem.position != 0) {
- leftBound = firstItem.offset * width;
- }
- if (lastItem.position != mAdapter.getCount() - 1) {
- rightBound = lastItem.offset * width;
- }
-
- if (scrollX < leftBound) {
- scrollX = leftBound;
- } else if (scrollX > rightBound) {
- scrollX = rightBound;
- }
- // Don't lose the rounded component
- mLastMotionX += scrollX - (int) scrollX;
- scrollTo((int) scrollX, getScrollY());
- pageScrolled((int) scrollX);
-
- // Synthesize an event for the VelocityTracker.
- final long time = SystemClock.uptimeMillis();
- final MotionEvent ev = MotionEvent.obtain(mFakeDragBeginTime, time, MotionEvent.ACTION_MOVE,
- mLastMotionX, 0, 0);
- mVelocityTracker.addMovement(ev);
- ev.recycle();
- } else {
- mLastMotionY += offset;
-
- float oldScrollY = getScrollY();
- float scrollY = oldScrollY - offset;
- final int height = getClientHeight();
-
- float topBound = height * mFirstOffset;
- float bottomBound = height * mLastOffset;
-
- final ItemInfo firstItem = mItems.get(0);
- final ItemInfo lastItem = mItems.get(mItems.size() - 1);
- if (firstItem.position != 0) {
- topBound = firstItem.offset * height;
- }
- if (lastItem.position != mAdapter.getCount() - 1) {
- bottomBound = lastItem.offset * height;
- }
-
- if (scrollY < topBound) {
- scrollY = topBound;
- } else if (scrollY > bottomBound) {
- scrollY = bottomBound;
- }
- // Don't lose the rounded component
- mLastMotionY += scrollY - (int) scrollY;
- scrollTo(getScrollX(), (int) scrollY);
- pageScrolled((int) scrollY);
-
- // Synthesize an event for the VelocityTracker.
- final long time = SystemClock.uptimeMillis();
- final MotionEvent ev = MotionEvent.obtain(mFakeDragBeginTime, time, MotionEvent.ACTION_MOVE,
- 0, mLastMotionY, 0);
- mVelocityTracker.addMovement(ev);
- ev.recycle();
- }
- }
-
- /**
- * Returns true if a fake drag is in progress.
- *
- * @return true if currently in a fake drag, false otherwise.
- *
- * @see #beginFakeDrag()
- * @see #fakeDragBy(float)
- * @see #endFakeDrag()
- */
- public boolean isFakeDragging() {
- return mFakeDragging;
- }
-
- private void onSecondaryPointerUp(MotionEvent ev) {
- final int pointerIndex = MotionEventCompat.getActionIndex(ev);
- final int pointerId = MotionEventCompat.getPointerId(ev, pointerIndex);
- if (pointerId == mActivePointerId) {
- // This was our active pointer going up. Choose a new
- // active pointer and adjust accordingly.
- final int newPointerIndex = pointerIndex == 0 ? 1 : 0;
- mLastMotionX = MotionEventCompat.getX(ev, newPointerIndex);
- mLastMotionY = MotionEventCompat.getY(ev, newPointerIndex);
- mActivePointerId = MotionEventCompat.getPointerId(ev, newPointerIndex);
- if (mVelocityTracker != null) {
- mVelocityTracker.clear();
- }
- }
- }
-
- private void endDrag() {
- mIsBeingDragged = false;
- mIsUnableToDrag = false;
-
- if (mVelocityTracker != null) {
- mVelocityTracker.recycle();
- mVelocityTracker = null;
- }
- }
-
- private void setScrollingCacheEnabled(boolean enabled) {
- if (mScrollingCacheEnabled != enabled) {
- mScrollingCacheEnabled = enabled;
- if (USE_CACHE) {
- final int size = getChildCount();
- for (int i = 0; i < size; ++i) {
- final View child = getChildAt(i);
- if (child.getVisibility() != GONE) {
- child.setDrawingCacheEnabled(enabled);
- }
- }
- }
- }
- }
-
- public boolean canScrollHorizontally(int direction) {
- if (mAdapter == null) {
- return false;
- }
-
- final int width = getClientWidth();
- final int scrollX = getScrollX();
- if (direction < 0) {
- return (scrollX > (int) (width * mFirstOffset));
- } else if (direction > 0) {
- return (scrollX < (int) (width * mLastOffset));
- } else {
- return false;
- }
- }
-
- public boolean canScrollVertically(int direction) {
- if (mAdapter == null) {
- return false;
- }
-
- final int height = getClientHeight();
- final int scrollY = getScrollY();
- if (direction < 0) {
- return (scrollY > (int) (height * mFirstOffset));
- } else if (direction > 0) {
- return (scrollY < (int) (height * mLastOffset));
- } else {
- return false;
- }
- }
-
- /**
- * Tests scrollability within child views of v given a delta of dx.
- *
- * @param v View to test for horizontal scrollability
- * @param checkV Whether the view v passed should itself be checked for scrollability (true),
- * or just its children (false).
- * @param dx Delta scrolled in pixels
- * @param x X coordinate of the active touch point
- * @param y Y coordinate of the active touch point
- * @return true if child views of v can be scrolled by delta of dx.
- */
- protected boolean canScroll(View v, boolean checkV, int dx, int x, int y) {
- if (v instanceof ViewGroup) {
- final ViewGroup group = (ViewGroup) v;
- final int scrollX = v.getScrollX();
- final int scrollY = v.getScrollY();
- final int count = group.getChildCount();
- // Count backwards - let topmost views consume scroll distance first.
- for (int i = count - 1; i >= 0; i--) {
- // TODO: Add versioned support here for transformed views.
- // This will not work for transformed views in Honeycomb+
- final View child = group.getChildAt(i);
- if (x + scrollX >= child.getLeft() && x + scrollX < child.getRight() &&
- y + scrollY >= child.getTop() && y + scrollY < child.getBottom() &&
- canScroll(child, true, dx, x + scrollX - child.getLeft(),
- y + scrollY - child.getTop())) {
- return true;
- }
- }
- }
-
- boolean canScroll = false;
- if (isOrientationHorizontal()) {
- canScroll = ViewCompat.canScrollHorizontally(v, -dx);
- } else {
- canScroll = ViewCompat.canScrollVertically(v, -dx);
- }
- return checkV && canScroll;
- }
-
- @Override
- public boolean dispatchKeyEvent(KeyEvent event) {
- // Let the focused view and/or our descendants get the key first
- return super.dispatchKeyEvent(event) || executeKeyEvent(event);
- }
-
- /**
- * You can call this function yourself to have the scroll view perform
- * scrolling from a key event, just as if the event had been dispatched to
- * it by the view hierarchy.
- *
- * @param event The key event to execute.
- * @return Return true if the event was handled, else false.
- */
- public boolean executeKeyEvent(KeyEvent event) {
- boolean handled = false;
- if (event.getAction() == KeyEvent.ACTION_DOWN) {
- switch (event.getKeyCode()) {
- case KeyEvent.KEYCODE_DPAD_LEFT:
- if (isOrientationHorizontal())
- handled = arrowScroll(FOCUS_LEFT);
- break;
- case KeyEvent.KEYCODE_DPAD_RIGHT:
- if (isOrientationHorizontal())
- handled = arrowScroll(FOCUS_RIGHT);
- break;
- case KeyEvent.KEYCODE_DPAD_UP:
- if (!isOrientationHorizontal())
- handled = arrowScroll(FOCUS_UP);
- break;
- case KeyEvent.KEYCODE_DPAD_DOWN:
- if (!isOrientationHorizontal())
- handled = arrowScroll(FOCUS_DOWN);
- break;
- case KeyEvent.KEYCODE_TAB:
- if (Build.VERSION.SDK_INT >= 11) {
- // The focus finder had a bug handling FOCUS_FORWARD and FOCUS_BACKWARD
- // before Android 3.0. Ignore the tab key on those devices.
- if (KeyEventCompat.hasNoModifiers(event)) {
- handled = arrowScroll(FOCUS_FORWARD);
- } else if (KeyEventCompat.hasModifiers(event, KeyEvent.META_SHIFT_ON)) {
- handled = arrowScroll(FOCUS_BACKWARD);
- }
- }
- break;
- }
- }
- return handled;
- }
-
- public boolean arrowScroll(int direction) {
- View currentFocused = findFocus();
- if (currentFocused == this) {
- currentFocused = null;
- } else if (currentFocused != null) {
- boolean isChild = false;
- for (ViewParent parent = currentFocused.getParent(); parent instanceof ViewGroup;
- parent = parent.getParent()) {
- if (parent == this) {
- isChild = true;
- break;
- }
- }
- if (!isChild) {
- // This would cause the focus search down below to fail in fun ways.
- final StringBuilder sb = new StringBuilder();
- sb.append(currentFocused.getClass().getSimpleName());
- for (ViewParent parent = currentFocused.getParent(); parent instanceof ViewGroup;
- parent = parent.getParent()) {
- sb.append(" => ").append(parent.getClass().getSimpleName());
- }
- Log.e(TAG, "arrowScroll tried to find focus based on non-child " +
- "current focused view " + sb.toString());
- currentFocused = null;
- }
- }
-
- boolean handled = false;
-
- View nextFocused = FocusFinder.getInstance().findNextFocus(this, currentFocused,
- direction);
- if (nextFocused != null && nextFocused != currentFocused) {
- if (direction == View.FOCUS_LEFT) {
- // If there is nothing to the left, or this is causing us to
- // jump to the right, then what we really want to do is page left.
- final int nextLeft = getChildRectInPagerCoordinates(mTempRect, nextFocused).left;
- final int currLeft = getChildRectInPagerCoordinates(mTempRect, currentFocused).left;
- if (currentFocused != null && nextLeft >= currLeft) {
- handled = pageLeft();
- } else {
- handled = nextFocused.requestFocus();
- }
- } else if (direction == View.FOCUS_RIGHT) {
- // If there is nothing to the right, or this is causing us to
- // jump to the left, then what we really want to do is page right.
- final int nextLeft = getChildRectInPagerCoordinates(mTempRect, nextFocused).left;
- final int currLeft = getChildRectInPagerCoordinates(mTempRect, currentFocused).left;
- if (currentFocused != null && nextLeft <= currLeft) {
- handled = pageRight();
- } else {
- handled = nextFocused.requestFocus();
- }
- } else if (direction == View.FOCUS_UP) {
- final int nextUp = getChildRectInPagerCoordinates(mTempRect, nextFocused).top;
- final int currUp = getChildRectInPagerCoordinates(mTempRect, currentFocused).top;
- if (currentFocused != null && nextUp >= currUp) {
- handled = pageLeft();
- } else {
- handled = nextFocused.requestFocus();
- }
- } else if (direction == View.FOCUS_DOWN) {
- final int nextUp = getChildRectInPagerCoordinates(mTempRect, nextFocused).top;
- final int currUp = getChildRectInPagerCoordinates(mTempRect, currentFocused).top;
- if (currentFocused != null && nextUp <= currUp) {
- handled = pageRight();
- } else {
- handled = nextFocused.requestFocus();
- }
- }
- } else if (direction == FOCUS_LEFT || direction == FOCUS_UP || direction == FOCUS_BACKWARD) {
- // Trying to move left and nothing there; try to page.
- handled = pageLeft();
- } else if (direction == FOCUS_RIGHT || direction == FOCUS_DOWN || direction == FOCUS_FORWARD) {
- // Trying to move right and nothing there; try to page.
- handled = pageRight();
- }
- if (handled) {
- playSoundEffect(SoundEffectConstants.getContantForFocusDirection(direction));
- }
- return handled;
- }
-
- private Rect getChildRectInPagerCoordinates(Rect outRect, View child) {
- if (outRect == null) {
- outRect = new Rect();
- }
- if (child == null) {
- outRect.set(0, 0, 0, 0);
- return outRect;
- }
- outRect.left = child.getLeft();
- outRect.right = child.getRight();
- outRect.top = child.getTop();
- outRect.bottom = child.getBottom();
-
- ViewParent parent = child.getParent();
- while (parent instanceof ViewGroup && parent != this) {
- final ViewGroup group = (ViewGroup) parent;
- outRect.left += group.getLeft();
- outRect.right += group.getRight();
- outRect.top += group.getTop();
- outRect.bottom += group.getBottom();
-
- parent = group.getParent();
- }
- return outRect;
- }
-
- boolean pageLeft() {
- if (mCurItem > 0) {
- setCurrentItem(mCurItem-1, true);
- return true;
- }
- return false;
- }
-
- boolean pageRight() {
- if (mAdapter != null && mCurItem < (mAdapter.getCount()-1)) {
- setCurrentItem(mCurItem+1, true);
- return true;
- }
- return false;
- }
-
- /**
- * We only want the current page that is being shown to be focusable.
- */
- @Override
- public void addFocusables(ArrayList views, int direction, int focusableMode) {
- final int focusableCount = views.size();
-
- final int descendantFocusability = getDescendantFocusability();
-
- if (descendantFocusability != FOCUS_BLOCK_DESCENDANTS) {
- for (int i = 0; i < getChildCount(); i++) {
- final View child = getChildAt(i);
- if (child.getVisibility() == VISIBLE) {
- ItemInfo ii = infoForChild(child);
- if (ii != null && ii.position == mCurItem) {
- child.addFocusables(views, direction, focusableMode);
- }
- }
- }
- }
-
- // we add ourselves (if focusable) in all cases except for when we are
- // FOCUS_AFTER_DESCENDANTS and there are some descendants focusable. this is
- // to avoid the focus search finding layouts when a more precise search
- // among the focusable children would be more interesting.
- if (
- descendantFocusability != FOCUS_AFTER_DESCENDANTS ||
- // No focusable descendants
- (focusableCount == views.size())) {
- // Note that we can't call the superclass here, because it will
- // add all views in. So we need to do the same thing View does.
- if (!isFocusable()) {
- return;
- }
- if ((focusableMode & FOCUSABLES_TOUCH_MODE) == FOCUSABLES_TOUCH_MODE &&
- isInTouchMode() && !isFocusableInTouchMode()) {
- return;
- }
- if (views != null) {
- views.add(this);
- }
- }
- }
-
- /**
- * We only want the current page that is being shown to be touchable.
- */
- @Override
- public void addTouchables(ArrayList views) {
- // Note that we don't call super.addTouchables(), which means that
- // we don't call View.addTouchables(). This is okay because a ViewPager
- // is itself not touchable.
- for (int i = 0; i < getChildCount(); i++) {
- final View child = getChildAt(i);
- if (child.getVisibility() == VISIBLE) {
- ItemInfo ii = infoForChild(child);
- if (ii != null && ii.position == mCurItem) {
- child.addTouchables(views);
- }
- }
- }
- }
-
- /**
- * We only want the current page that is being shown to be focusable.
- */
- @Override
- protected boolean onRequestFocusInDescendants(int direction,
- Rect previouslyFocusedRect) {
- int index;
- int increment;
- int end;
- int count = getChildCount();
- if ((direction & FOCUS_FORWARD) != 0) {
- index = 0;
- increment = 1;
- end = count;
- } else {
- index = count - 1;
- increment = -1;
- end = -1;
- }
- for (int i = index; i != end; i += increment) {
- View child = getChildAt(i);
- if (child.getVisibility() == VISIBLE) {
- ItemInfo ii = infoForChild(child);
- if (ii != null && ii.position == mCurItem) {
- if (child.requestFocus(direction, previouslyFocusedRect)) {
- return true;
- }
- }
- }
- }
- return false;
- }
-
- @Override
- public boolean dispatchPopulateAccessibilityEvent(AccessibilityEvent event) {
- // Dispatch scroll events from this ViewPager.
- if (event.getEventType() == AccessibilityEventCompat.TYPE_VIEW_SCROLLED) {
- return super.dispatchPopulateAccessibilityEvent(event);
- }
-
- // Dispatch all other accessibility events from the current page.
- final int childCount = getChildCount();
- for (int i = 0; i < childCount; i++) {
- final View child = getChildAt(i);
- if (child.getVisibility() == VISIBLE) {
- final ItemInfo ii = infoForChild(child);
- if (ii != null && ii.position == mCurItem &&
- child.dispatchPopulateAccessibilityEvent(event)) {
- return true;
- }
- }
- }
-
- return false;
- }
-
- @Override
- protected ViewGroup.LayoutParams generateDefaultLayoutParams() {
- return new LayoutParams();
- }
-
- @Override
- protected ViewGroup.LayoutParams generateLayoutParams(ViewGroup.LayoutParams p) {
- return generateDefaultLayoutParams();
- }
-
- @Override
- protected boolean checkLayoutParams(ViewGroup.LayoutParams p) {
- return p instanceof LayoutParams && super.checkLayoutParams(p);
- }
-
- @Override
- public ViewGroup.LayoutParams generateLayoutParams(AttributeSet attrs) {
- return new LayoutParams(getContext(), attrs);
- }
-
- class MyAccessibilityDelegate extends AccessibilityDelegateCompat {
-
- @Override
- public void onInitializeAccessibilityEvent(View host, AccessibilityEvent event) {
- super.onInitializeAccessibilityEvent(host, event);
- event.setClassName(ViewPager.class.getName());
- final AccessibilityRecordCompat recordCompat = AccessibilityRecordCompat.obtain();
- recordCompat.setScrollable(canScroll());
- if (event.getEventType() == AccessibilityEventCompat.TYPE_VIEW_SCROLLED
- && mAdapter != null) {
- recordCompat.setItemCount(mAdapter.getCount());
- recordCompat.setFromIndex(mCurItem);
- recordCompat.setToIndex(mCurItem);
- }
- }
-
- @Override
- public void onInitializeAccessibilityNodeInfo(View host, AccessibilityNodeInfoCompat info) {
- super.onInitializeAccessibilityNodeInfo(host, info);
- info.setClassName(ViewPager.class.getName());
- info.setScrollable(canScroll());
- if (canScrollHorizontally(1)) {
- info.addAction(AccessibilityNodeInfoCompat.ACTION_SCROLL_FORWARD);
- }
- if (canScrollHorizontally(-1)) {
- info.addAction(AccessibilityNodeInfoCompat.ACTION_SCROLL_BACKWARD);
- }
- }
-
- @Override
- public boolean performAccessibilityAction(View host, int action, Bundle args) {
- if (super.performAccessibilityAction(host, action, args)) {
- return true;
- }
- switch (action) {
- case AccessibilityNodeInfoCompat.ACTION_SCROLL_FORWARD: {
- if (canScrollHorizontally(1)) {
- setCurrentItem(mCurItem + 1);
- return true;
- }
- } return false;
- case AccessibilityNodeInfoCompat.ACTION_SCROLL_BACKWARD: {
- if (canScrollHorizontally(-1)) {
- setCurrentItem(mCurItem - 1);
- return true;
- }
- } return false;
- }
- return false;
- }
-
- private boolean canScroll() {
- return (mAdapter != null) && (mAdapter.getCount() > 1);
- }
- }
-
- private class PagerObserver extends DataSetObserver {
- @Override
- public void onChanged() {
- dataSetChanged();
- }
- @Override
- public void onInvalidated() {
- dataSetChanged();
- }
- }
-
- /**
- * Layout parameters that should be supplied for views added to a
- * ViewPager.
- */
- public static class LayoutParams extends ViewGroup.LayoutParams {
- /**
- * true if this view is a decoration on the pager itself and not
- * a view supplied by the adapter.
- */
- public boolean isDecor;
-
- /**
- * Gravity setting for use on decor views only:
- * Where to position the view page within the overall ViewPager
- * container; constants are defined in {@link android.view.Gravity}.
- */
- public int gravity;
-
- /**
- * Width as a 0-1 multiplier of the measured pager width
- */
- float sizeFactor = 0.f;
-
- /**
- * true if this view was added during layout and needs to be measured
- * before being positioned.
- */
- boolean needsMeasure;
-
- /**
- * Adapter position this view is for if !isDecor
- */
- int position;
-
- /**
- * Current child index within the ViewPager that this view occupies
- */
- int childIndex;
-
- public LayoutParams() {
- super(MATCH_PARENT, MATCH_PARENT);
- }
-
- public LayoutParams(Context context, AttributeSet attrs) {
- super(context, attrs);
-
- final TypedArray a = context.obtainStyledAttributes(attrs, LAYOUT_ATTRS);
- gravity = a.getInteger(0, Gravity.TOP);
- a.recycle();
- }
- }
-
- static class ViewPositionComparator implements Comparator {
- @Override
- public int compare(View lhs, View rhs) {
- final LayoutParams llp = (LayoutParams) lhs.getLayoutParams();
- final LayoutParams rlp = (LayoutParams) rhs.getLayoutParams();
- if (llp.isDecor != rlp.isDecor) {
- return llp.isDecor ? 1 : -1;
- }
- return llp.position - rlp.position;
- }
- }
-}
\ No newline at end of file
diff --git a/ViewPager/src/main/res/values-v11/styles.xml b/ViewPager/src/main/res/values-v11/styles.xml
deleted file mode 100644
index 3c02242ad..000000000
--- a/ViewPager/src/main/res/values-v11/styles.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-
-
-
diff --git a/ViewPager/src/main/res/values-v14/styles.xml b/ViewPager/src/main/res/values-v14/styles.xml
deleted file mode 100644
index a91fd0372..000000000
--- a/ViewPager/src/main/res/values-v14/styles.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-
-
-
-
diff --git a/ViewPager/src/main/res/values/attrs.xml b/ViewPager/src/main/res/values/attrs.xml
deleted file mode 100644
index be14d4ce3..000000000
--- a/ViewPager/src/main/res/values/attrs.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/ViewPager/src/main/res/values/strings.xml b/ViewPager/src/main/res/values/strings.xml
deleted file mode 100644
index cc18fb0a3..000000000
--- a/ViewPager/src/main/res/values/strings.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-
- ViewPager
-
diff --git a/ViewPager/src/main/res/values/styles.xml b/ViewPager/src/main/res/values/styles.xml
deleted file mode 100644
index 6ce89c7ba..000000000
--- a/ViewPager/src/main/res/values/styles.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-
-
-
-
-
-
-
-
-
diff --git a/build.gradle b/build.gradle
index f9459da6b..143e57b76 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,7 +1,7 @@
// Top-level build file where you can add configuration options common to all sub-projects/modules.
buildscript {
- ext.KOTLIN_VERSION = '1.2.71'
+ apply from: 'versions.gradle'
repositories {
google()
@@ -9,45 +9,33 @@ buildscript {
}
dependencies {
- classpath 'com.android.tools.build:gradle:3.1.4'
+ classpath "com.android.tools.build:gradle:$versions.androidGradlePlugin"
// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.7.3'
- classpath 'com.github.dcendents:android-maven-gradle-plugin:2.0'
- classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$KOTLIN_VERSION"
+ classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1'
+ classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$versions.kotlin"
}
}
allprojects {
+
+ configurations.all {
+ resolutionStrategy {
+ cacheChangingModulesFor 0, 'seconds'
+ }
+ }
+
repositories {
+ mavenLocal()
google()
jcenter()
- maven { url "https://dl.bintray.com/mobisystech/maven" }
maven { url "https://jitpack.io" }
- mavenLocal()
}
}
-ext {
- FOLIOREADER_SDK_VERSION = '0.5.1'
- R2_STREAMER_KOTLIN_VERSION = '1.0.3-5'
- R2_SHARED_KOTLIN_VERSION = '1.0.3-2'
-
- VERSION_NAME = "1.0"
- VERSION_CODE = 1
-
- ANDROID_MIN_SDK = 19
- ANDROID_COMPILE_SDK_VERSION = 28
- ANDROID_TARGET_SDK_VERSION = 28
- ANDROID_LIB_VERSION = '28.0.0'
-
- CONSTRAINT_LAYOUT_VERSION = "1.1.3"
-
- JACKSON_VERSION = '2.8.6'
-}
-
task clean(type: Delete) {
delete rootProject.buildDir
}
diff --git a/config/quality/checkstyle/checkstyle-config.xml b/config/quality/checkstyle/checkstyle-config.xml
index 045ddb97c..5577b4f35 100755
--- a/config/quality/checkstyle/checkstyle-config.xml
+++ b/config/quality/checkstyle/checkstyle-config.xml
@@ -1,16 +1,15 @@
-
-
-
+
-
+
-
+
-
+
@@ -18,133 +17,123 @@
-
+
-
+
-
-
+
+
-
-
+
+
-
+
-
+
-
-
+
+
-
+
-
+
-
+
-
+
-
-
-
-
-
-
+
+
+
+
+
+
-
-
-
-
+
+
+
+
-
-
-
-
+
+
+
+
-
-
+ value="WhitespaceAround: ''{0}'' is not followed by whitespace. Empty blocks may only be represented as '{}' when not part of a multi-block statement (4.1.3)" />
+
+
-
+
-
-
+
+
-
-
+
+
-
-
+
+
-
+
-
-
+
+
-
-
-
-
+
+
+
+
-
-
+
+
-
-
+
+
diff --git a/config/quality/findbugs/android-exclude-filter.xml b/config/quality/findbugs/android-exclude-filter.xml
index b724212b1..aed4207f3 100755
--- a/config/quality/findbugs/android-exclude-filter.xml
+++ b/config/quality/findbugs/android-exclude-filter.xml
@@ -1,10 +1,10 @@
-
+
-
+
diff --git a/config/quality/pmd/pmd-ruleset.xml b/config/quality/pmd/pmd-ruleset.xml
index ad418930c..e018fb435 100755
--- a/config/quality/pmd/pmd-ruleset.xml
+++ b/config/quality/pmd/pmd-ruleset.xml
@@ -1,7 +1,6 @@
Custom ruleset for ribot Android application
diff --git a/config/quality/quality.gradle b/config/quality/quality.gradle
index 8a0689711..f7f6f45ec 100755
--- a/config/quality/quality.gradle
+++ b/config/quality/quality.gradle
@@ -31,23 +31,23 @@ task checkstyle(type: Checkstyle, group: 'Verification', description: 'Runs code
reports {
xml.enabled = true
xml {
- destination "$reportsDir/checkstyle/checkstyle.xml"
+ destination = file("$reportsDir/checkstyle/checkstyle.xml")
}
}
- classpath = files( )
+ classpath = files()
}
task findbugs(type: FindBugs,
group: 'Verification',
description: 'Inspect java bytecode for bugs',
- dependsOn: ['compileDebugSources','compileReleaseSources']) {
+ dependsOn: ['compileDebugSources', 'compileReleaseSources']) {
ignoreFailures = false
effort = "max"
reportLevel = "high"
excludeFilter = new File("$qualityConfigDir/findbugs/android-exclude-filter.xml")
- classes = files("$project.rootDir/folioreader/build/intermediates/classes")
+ classes = files("$project.rootDir/folioreader/build/intermediates/javac")
source 'src'
include '**/*.java'
@@ -57,10 +57,10 @@ task findbugs(type: FindBugs,
xml.enabled = false
html.enabled = true
xml {
- destination "$reportsDir/findbugs/findbugs.xml"
+ destination = file("$reportsDir/findbugs/findbugs.xml")
}
html {
- destination "$reportsDir/findbugs/findbugs.html"
+ destination = file("$reportsDir/findbugs/findbugs.html")
}
}
@@ -81,10 +81,10 @@ task pmd(type: Pmd, group: 'Verification', description: 'Inspect sourcecode for
xml.enabled = true
html.enabled = true
xml {
- destination "$reportsDir/pmd/pmd.xml"
+ destination = file("$reportsDir/pmd/pmd.xml")
}
html {
- destination "$reportsDir/pmd/pmd.html"
+ destination = file("$reportsDir/pmd/pmd.html")
}
}
}
\ No newline at end of file
diff --git a/folioreader/AndroidManifest.xml b/folioreader/AndroidManifest.xml
index b9ac4d38f..96e7be6ee 100644
--- a/folioreader/AndroidManifest.xml
+++ b/folioreader/AndroidManifest.xml
@@ -10,24 +10,25 @@
diff --git a/folioreader/bintray/bintrayv1.gradle b/folioreader/bintray/bintrayv1.gradle
index fa392e442..79811e671 100644
--- a/folioreader/bintray/bintrayv1.gradle
+++ b/folioreader/bintray/bintrayv1.gradle
@@ -31,7 +31,7 @@ artifacts {
// Bintray
def propertiesFile = project.rootProject.file('local.properties')
-if( propertiesFile.exists()) {
+if (propertiesFile.exists()) {
Properties properties = new Properties()
properties.load(propertiesFile.newDataInputStream())
diff --git a/folioreader/build.gradle b/folioreader/build.gradle
index 942c94b1b..f41712cc4 100644
--- a/folioreader/build.gradle
+++ b/folioreader/build.gradle
@@ -17,7 +17,7 @@ ext {
siteUrl = 'https://github.com/FolioReader/FolioReader-Android'
gitUrl = 'https://github.com/FolioReader/FolioReader-Android.git'
- libraryVersion = FOLIOREADER_SDK_VERSION
+ libraryVersion = versions.folioreaderSdk
developerId = 'mobisystech'
developerName = 'Folio Reader'
@@ -30,13 +30,13 @@ ext {
android {
useLibrary 'org.apache.http.legacy'
- compileSdkVersion ANDROID_COMPILE_SDK_VERSION
+ compileSdkVersion versions.androidCompileSdk
defaultConfig {
- minSdkVersion ANDROID_MIN_SDK
- targetSdkVersion ANDROID_TARGET_SDK_VERSION
- versionCode VERSION_CODE
- versionName VERSION_NAME
+ minSdkVersion versions.androidMinSdk
+ targetSdkVersion versions.androidTargetSdk
+ versionCode versions.projectVersionCode
+ versionName versions.projectVersionName
vectorDrawables.useSupportLibrary = true
}
@@ -51,11 +51,6 @@ android {
}
}
- compileOptions {
- sourceCompatibility JavaVersion.VERSION_1_7
- targetCompatibility JavaVersion.VERSION_1_7
- }
-
packagingOptions {
exclude 'META-INF/ASL2.0'
exclude 'META-INF/DEPENDENCIES.txt'
@@ -85,31 +80,43 @@ apply from: '../folioreader/bintray/installv1.gradle'
dependencies {
implementation fileTree(include: ['*.jar'], dir: 'libs')
- implementation "com.android.support.constraint:constraint-layout:$CONSTRAINT_LAYOUT_VERSION"
- implementation "com.android.support:appcompat-v7:$ANDROID_LIB_VERSION"
- implementation "com.android.support:recyclerview-v7:$ANDROID_LIB_VERSION"
- implementation "com.android.support:support-v4:$ANDROID_LIB_VERSION"
- implementation "com.android.support:design:$ANDROID_LIB_VERSION"
+ implementation "androidx.appcompat:appcompat:$versions.appcompat"
+ implementation "androidx.constraintlayout:constraintlayout:$versions.constraintLayout"
+ implementation "androidx.recyclerview:recyclerview:$versions.recyclerview"
+ implementation "com.google.android.material:material:$versions.material"
+ testImplementation 'junit:junit:4.12'
implementation 'org.slf4j:slf4j-android:1.7.25'
implementation 'com.daimajia.swipelayout:library:1.2.0@aar'
//Kotlin
- implementation "org.jetbrains.kotlin:kotlin-stdlib:$KOTLIN_VERSION"
+ implementation "org.jetbrains.kotlin:kotlin-stdlib:$versions.kotlin"
implementation 'org.greenrobot:eventbus:3.1.1'
- implementation "com.fasterxml.jackson.core:jackson-core:$JACKSON_VERSION"
- implementation "com.fasterxml.jackson.core:jackson-annotations:$JACKSON_VERSION"
- implementation "com.fasterxml.jackson.core:jackson-databind:$JACKSON_VERSION"
+ implementation "com.fasterxml.jackson.core:jackson-core:$versions.jackson"
+ implementation "com.fasterxml.jackson.core:jackson-annotations:$versions.jackson"
+ implementation "com.fasterxml.jackson.core:jackson-databind:$versions.jackson"
+ implementation "com.fasterxml.jackson.module:jackson-module-kotlin:$versions.jackson"
+ implementation "com.google.code.gson:gson:$versions.gson"
+
+ implementation "com.squareup.retrofit2:retrofit:$versions.retrofit"
+ implementation "com.squareup.retrofit2:converter-jackson:$versions.retrofit"
+ implementation "com.squareup.retrofit2:converter-gson:$versions.retrofit"
// R2 modules
- implementation "com.github.codetoart:r2-shared-kotlin:$R2_SHARED_KOTLIN_VERSION"
- implementation("com.github.codetoart:r2-streamer-kotlin:$R2_STREAMER_KOTLIN_VERSION") {
+ api("com.github.codetoart:r2-shared-kotlin:$versions.r2SharedKotlin") {
+ changing = true
+ }
+ api("com.github.codetoart:r2-streamer-kotlin:$versions.r2StreamerKotlin") {
exclude group: "org.slf4j", module: "slf4j-api"
+ changing = true
}
- // To use only ReflectionUtils in Spring framework
+ // Only ReflectionUtils in Spring framework is used
implementation 'org.springframework:spring-core:4.3.19.RELEASE'
+
+ // Lifecycle
+ implementation "androidx.lifecycle:lifecycle-extensions:$versions.lifecycle"
}
apply from: '../folioreader/bintray/bintrayv1.gradle'
diff --git a/folioreader/res/anim/disappear.xml b/folioreader/res/anim/disappear.xml
index 21e6a4df3..9c0d3f23f 100644
--- a/folioreader/res/anim/disappear.xml
+++ b/folioreader/res/anim/disappear.xml
@@ -2,8 +2,8 @@
+ android:interpolator="@android:anim/decelerate_interpolator"
+ android:fromAlpha="1.0"
+ android:toAlpha="0.0"
+ android:duration="400" />
\ No newline at end of file
diff --git a/folioreader/res/anim/enter_from_left.xml b/folioreader/res/anim/enter_from_left.xml
index 7e0506f0d..2d00384df 100644
--- a/folioreader/res/anim/enter_from_left.xml
+++ b/folioreader/res/anim/enter_from_left.xml
@@ -2,7 +2,9 @@
+ android:fromXDelta="-100%"
+ android:toXDelta="0%"
+ android:fromYDelta="0%"
+ android:toYDelta="0%"
+ android:duration="700" />
\ No newline at end of file
diff --git a/folioreader/res/anim/enter_from_right.xml b/folioreader/res/anim/enter_from_right.xml
index a78db395e..e2a8e7c21 100644
--- a/folioreader/res/anim/enter_from_right.xml
+++ b/folioreader/res/anim/enter_from_right.xml
@@ -2,7 +2,9 @@
\ No newline at end of file
diff --git a/folioreader/res/anim/exit_to_left.xml b/folioreader/res/anim/exit_to_left.xml
index 8c076732c..0b8b5fc71 100644
--- a/folioreader/res/anim/exit_to_left.xml
+++ b/folioreader/res/anim/exit_to_left.xml
@@ -2,7 +2,9 @@
+ android:fromXDelta="0%"
+ android:toXDelta="-100%"
+ android:fromYDelta="0%"
+ android:toYDelta="0%"
+ android:duration="700" />
\ No newline at end of file
diff --git a/folioreader/res/anim/exit_to_right.xml b/folioreader/res/anim/exit_to_right.xml
index 255d47abd..b7d1893cc 100644
--- a/folioreader/res/anim/exit_to_right.xml
+++ b/folioreader/res/anim/exit_to_right.xml
@@ -2,7 +2,9 @@
\ No newline at end of file
diff --git a/folioreader/res/anim/fadein.xml b/folioreader/res/anim/fadein.xml
index 3c7c297fc..7df24c3fa 100644
--- a/folioreader/res/anim/fadein.xml
+++ b/folioreader/res/anim/fadein.xml
@@ -1,9 +1,8 @@
+ android:interpolator="@android:anim/linear_interpolator">
+ android:fromAlpha="0.1"
+ android:toAlpha="1.0"
+ android:duration="1500" />
\ No newline at end of file
diff --git a/folioreader/res/anim/fadeout.xml b/folioreader/res/anim/fadeout.xml
index 836015d7a..e0408f293 100644
--- a/folioreader/res/anim/fadeout.xml
+++ b/folioreader/res/anim/fadeout.xml
@@ -1,9 +1,8 @@
+ android:interpolator="@android:anim/linear_interpolator">
+ android:fromAlpha="1.0"
+ android:toAlpha="0.1"
+ android:duration="1500" />
\ No newline at end of file
diff --git a/folioreader/res/anim/grow_from_bottom.xml b/folioreader/res/anim/grow_from_bottom.xml
index b9edc5a0a..2547166bb 100644
--- a/folioreader/res/anim/grow_from_bottom.xml
+++ b/folioreader/res/anim/grow_from_bottom.xml
@@ -1,14 +1,16 @@
+ android:fromXScale="0.3"
+ android:toXScale="1.0"
+ android:fromYScale="0.3"
+ android:toYScale="1.0"
+ android:pivotX="50%"
+ android:pivotY="100%"
+ android:duration="@android:integer/config_shortAnimTime" />
+ android:interpolator="@android:anim/decelerate_interpolator"
+ android:fromAlpha="0.0"
+ android:toAlpha="1.0"
+ android:duration="@android:integer/config_shortAnimTime" />
diff --git a/folioreader/res/anim/grow_from_bottomleft_to_topright.xml b/folioreader/res/anim/grow_from_bottomleft_to_topright.xml
index 7cbecadc5..13768b5ee 100644
--- a/folioreader/res/anim/grow_from_bottomleft_to_topright.xml
+++ b/folioreader/res/anim/grow_from_bottomleft_to_topright.xml
@@ -1,14 +1,16 @@
+ android:fromXScale="0.3"
+ android:toXScale="1.0"
+ android:fromYScale="0.3"
+ android:toYScale="1.0"
+ android:pivotX="0%"
+ android:pivotY="50%"
+ android:duration="@android:integer/config_shortAnimTime" />
+ android:interpolator="@android:anim/decelerate_interpolator"
+ android:fromAlpha="0.0"
+ android:toAlpha="1.0"
+ android:duration="@android:integer/config_shortAnimTime" />
\ No newline at end of file
diff --git a/folioreader/res/anim/grow_from_bottomright_to_topleft.xml b/folioreader/res/anim/grow_from_bottomright_to_topleft.xml
index 965f0904d..97f029400 100644
--- a/folioreader/res/anim/grow_from_bottomright_to_topleft.xml
+++ b/folioreader/res/anim/grow_from_bottomright_to_topleft.xml
@@ -1,14 +1,16 @@
+ android:fromXScale="0.3"
+ android:toXScale="1.0"
+ android:fromYScale="0.3"
+ android:toYScale="1.0"
+ android:pivotX="100%"
+ android:pivotY="50%"
+ android:duration="@android:integer/config_shortAnimTime" />
+ android:interpolator="@android:anim/decelerate_interpolator"
+ android:fromAlpha="0.0"
+ android:toAlpha="1.0"
+ android:duration="@android:integer/config_shortAnimTime" />
\ No newline at end of file
diff --git a/folioreader/res/anim/grow_from_top.xml b/folioreader/res/anim/grow_from_top.xml
index e2831ffe7..c0418d81a 100644
--- a/folioreader/res/anim/grow_from_top.xml
+++ b/folioreader/res/anim/grow_from_top.xml
@@ -1,14 +1,16 @@
+ android:fromXScale="0.3"
+ android:toXScale="1.0"
+ android:fromYScale="0.3"
+ android:toYScale="1.0"
+ android:pivotX="50%"
+ android:pivotY="0%"
+ android:duration="@android:integer/config_shortAnimTime" />
+ android:interpolator="@android:anim/decelerate_interpolator"
+ android:fromAlpha="0.0"
+ android:toAlpha="1.0"
+ android:duration="@android:integer/config_shortAnimTime" />
diff --git a/folioreader/res/anim/grow_from_topleft_to_bottomright.xml b/folioreader/res/anim/grow_from_topleft_to_bottomright.xml
index a75e86c0a..b172ebe1f 100644
--- a/folioreader/res/anim/grow_from_topleft_to_bottomright.xml
+++ b/folioreader/res/anim/grow_from_topleft_to_bottomright.xml
@@ -1,14 +1,16 @@
+ android:fromXScale="0.3"
+ android:toXScale="1.0"
+ android:fromYScale="0.3"
+ android:toYScale="1.0"
+ android:pivotX="0%"
+ android:pivotY="0%"
+ android:duration="@android:integer/config_shortAnimTime" />
+ android:interpolator="@android:anim/decelerate_interpolator"
+ android:fromAlpha="0.0"
+ android:toAlpha="1.0"
+ android:duration="@android:integer/config_shortAnimTime" />
diff --git a/folioreader/res/anim/grow_from_topright_to_bottomleft.xml b/folioreader/res/anim/grow_from_topright_to_bottomleft.xml
index 141c19c3a..44a1b0998 100644
--- a/folioreader/res/anim/grow_from_topright_to_bottomleft.xml
+++ b/folioreader/res/anim/grow_from_topright_to_bottomleft.xml
@@ -1,14 +1,16 @@
+ android:fromXScale="0.3"
+ android:toXScale="1.0"
+ android:fromYScale="0.3"
+ android:toYScale="1.0"
+ android:pivotX="100%"
+ android:pivotY="0%"
+ android:duration="@android:integer/config_shortAnimTime" />
+ android:interpolator="@android:anim/decelerate_interpolator"
+ android:fromAlpha="0.0"
+ android:toAlpha="1.0"
+ android:duration="@android:integer/config_shortAnimTime" />
\ No newline at end of file
diff --git a/folioreader/res/anim/pump_bottom.xml b/folioreader/res/anim/pump_bottom.xml
index 2c8ec4c15..e5854e855 100644
--- a/folioreader/res/anim/pump_bottom.xml
+++ b/folioreader/res/anim/pump_bottom.xml
@@ -1,14 +1,16 @@
+ android:fromXScale="1.1"
+ android:toXScale="1.0"
+ android:fromYScale="1.1"
+ android:toYScale="1.0"
+ android:pivotX="50%"
+ android:pivotY="100%"
+ android:duration="@android:integer/config_shortAnimTime" />
+ android:interpolator="@android:anim/decelerate_interpolator"
+ android:fromAlpha="0.0"
+ android:toAlpha="1.0"
+ android:duration="@android:integer/config_shortAnimTime" />
diff --git a/folioreader/res/anim/pump_top.xml b/folioreader/res/anim/pump_top.xml
index c77e8cfaf..ab2b6121a 100644
--- a/folioreader/res/anim/pump_top.xml
+++ b/folioreader/res/anim/pump_top.xml
@@ -1,14 +1,16 @@
+ android:fromXScale="1.1"
+ android:toXScale="1.0"
+ android:fromYScale="1.1"
+ android:toYScale="1.0"
+ android:pivotX="50%"
+ android:pivotY="0%"
+ android:duration="@android:integer/config_shortAnimTime" />
+ android:interpolator="@android:anim/decelerate_interpolator"
+ android:fromAlpha="0.0"
+ android:toAlpha="1.0"
+ android:duration="@android:integer/config_shortAnimTime" />
diff --git a/folioreader/res/anim/shrink_from_bottom.xml b/folioreader/res/anim/shrink_from_bottom.xml
index 98a15c93e..ac51e4eed 100644
--- a/folioreader/res/anim/shrink_from_bottom.xml
+++ b/folioreader/res/anim/shrink_from_bottom.xml
@@ -1,14 +1,16 @@
+ android:fromXScale="1.0"
+ android:toXScale="0.3"
+ android:fromYScale="1.0"
+ android:toYScale="0.3"
+ android:pivotX="50%"
+ android:pivotY="0%"
+ android:duration="@android:integer/config_shortAnimTime" />
+ android:interpolator="@android:anim/accelerate_interpolator"
+ android:fromAlpha="1.0"
+ android:toAlpha="0.0"
+ android:duration="@android:integer/config_shortAnimTime" />
diff --git a/folioreader/res/anim/shrink_from_bottomleft_to_topright.xml b/folioreader/res/anim/shrink_from_bottomleft_to_topright.xml
index 0551a768b..0a409b3ee 100644
--- a/folioreader/res/anim/shrink_from_bottomleft_to_topright.xml
+++ b/folioreader/res/anim/shrink_from_bottomleft_to_topright.xml
@@ -1,14 +1,16 @@
+ android:fromXScale="1.0"
+ android:toXScale="0.3"
+ android:fromYScale="1.0"
+ android:toYScale="0.3"
+ android:pivotX="100%"
+ android:pivotY="0%"
+ android:duration="@android:integer/config_shortAnimTime" />
+ android:interpolator="@android:anim/accelerate_interpolator"
+ android:fromAlpha="1.0"
+ android:toAlpha="0.0"
+ android:duration="@android:integer/config_shortAnimTime" />
\ No newline at end of file
diff --git a/folioreader/res/anim/shrink_from_bottomright_to_topleft.xml b/folioreader/res/anim/shrink_from_bottomright_to_topleft.xml
index bcbb9a92b..87558b9ce 100644
--- a/folioreader/res/anim/shrink_from_bottomright_to_topleft.xml
+++ b/folioreader/res/anim/shrink_from_bottomright_to_topleft.xml
@@ -1,14 +1,16 @@
+ android:fromXScale="1.0"
+ android:toXScale="0.3"
+ android:fromYScale="1.0"
+ android:toYScale="0.3"
+ android:pivotX="0%"
+ android:pivotY="0%"
+ android:duration="@android:integer/config_shortAnimTime" />
+ android:interpolator="@android:anim/accelerate_interpolator"
+ android:fromAlpha="1.0"
+ android:toAlpha="0.0"
+ android:duration="@android:integer/config_shortAnimTime" />
diff --git a/folioreader/res/anim/shrink_from_top.xml b/folioreader/res/anim/shrink_from_top.xml
index 8ea8ab72a..c7bc1813b 100644
--- a/folioreader/res/anim/shrink_from_top.xml
+++ b/folioreader/res/anim/shrink_from_top.xml
@@ -1,14 +1,16 @@
+ android:fromXScale="1.0"
+ android:toXScale="0.3"
+ android:fromYScale="1.0"
+ android:toYScale="0.3"
+ android:pivotX="50%"
+ android:pivotY="100%"
+ android:duration="@android:integer/config_shortAnimTime" />
+ android:interpolator="@android:anim/accelerate_interpolator"
+ android:fromAlpha="1.0"
+ android:toAlpha="0.0"
+ android:duration="@android:integer/config_shortAnimTime" />
diff --git a/folioreader/res/anim/shrink_from_topleft_to_bottomright.xml b/folioreader/res/anim/shrink_from_topleft_to_bottomright.xml
index 86cb79fe1..415e0c9e0 100644
--- a/folioreader/res/anim/shrink_from_topleft_to_bottomright.xml
+++ b/folioreader/res/anim/shrink_from_topleft_to_bottomright.xml
@@ -1,14 +1,16 @@
+ android:fromXScale="1.0"
+ android:toXScale="0.3"
+ android:fromYScale="1.0"
+ android:toYScale="0.3"
+ android:pivotX="100%"
+ android:pivotY="100%"
+ android:duration="@android:integer/config_shortAnimTime" />
+ android:interpolator="@android:anim/accelerate_interpolator"
+ android:fromAlpha="1.0"
+ android:toAlpha="0.0"
+ android:duration="@android:integer/config_shortAnimTime" />
\ No newline at end of file
diff --git a/folioreader/res/anim/shrink_from_topright_to_bottomleft.xml b/folioreader/res/anim/shrink_from_topright_to_bottomleft.xml
index 11103f66e..645424c4d 100644
--- a/folioreader/res/anim/shrink_from_topright_to_bottomleft.xml
+++ b/folioreader/res/anim/shrink_from_topright_to_bottomleft.xml
@@ -1,14 +1,16 @@
+ android:fromXScale="1.0"
+ android:toXScale="0.3"
+ android:fromYScale="1.0"
+ android:toYScale="0.3"
+ android:pivotX="0%"
+ android:pivotY="100%"
+ android:duration="@android:integer/config_shortAnimTime" />
+ android:interpolator="@android:anim/accelerate_interpolator"
+ android:fromAlpha="1.0"
+ android:toAlpha="0.0"
+ android:duration="@android:integer/config_shortAnimTime" />
diff --git a/folioreader/res/anim/slide_down.xml b/folioreader/res/anim/slide_down.xml
index f7d612422..da6aa6e2d 100644
--- a/folioreader/res/anim/slide_down.xml
+++ b/folioreader/res/anim/slide_down.xml
@@ -1,5 +1,5 @@
-
+
-
+
\ No newline at end of file
diff --git a/folioreader/res/drawable/btn_contents_highlights.xml b/folioreader/res/drawable/btn_contents_highlights.xml
index 0107251fa..d54daa44c 100644
--- a/folioreader/res/drawable/btn_contents_highlights.xml
+++ b/folioreader/res/drawable/btn_contents_highlights.xml
@@ -1,8 +1,9 @@
-
-
+
-
+ android:shape="rectangle">
+
-
+
\ No newline at end of file
diff --git a/folioreader/res/drawable/btn_moon_selector.xml b/folioreader/res/drawable/btn_moon_selector.xml
index 883d4e512..23b83c05e 100644
--- a/folioreader/res/drawable/btn_moon_selector.xml
+++ b/folioreader/res/drawable/btn_moon_selector.xml
@@ -1,7 +1,7 @@
-
-
-
-
+
+
+
+
diff --git a/folioreader/res/drawable/btn_sun_selector.xml b/folioreader/res/drawable/btn_sun_selector.xml
index 4e863bd38..dd4e31900 100644
--- a/folioreader/res/drawable/btn_sun_selector.xml
+++ b/folioreader/res/drawable/btn_sun_selector.xml
@@ -1,7 +1,7 @@
-
-
-
-
+
+
+
+
diff --git a/folioreader/res/drawable/content_highlight_back_selector_night_mode.xml b/folioreader/res/drawable/content_highlight_back_selector_night_mode.xml
index 2b3fc9461..64dc07803 100644
--- a/folioreader/res/drawable/content_highlight_back_selector_night_mode.xml
+++ b/folioreader/res/drawable/content_highlight_back_selector_night_mode.xml
@@ -1,7 +1,7 @@
-
-
-
-
+
+
+
+
diff --git a/folioreader/res/drawable/content_highlight_text_selector.xml b/folioreader/res/drawable/content_highlight_text_selector.xml
index c453f88f5..ad9decd48 100644
--- a/folioreader/res/drawable/content_highlight_text_selector.xml
+++ b/folioreader/res/drawable/content_highlight_text_selector.xml
@@ -1,7 +1,7 @@
-
-
-
-
+
+
+
+
diff --git a/folioreader/res/drawable/dottet_line.xml b/folioreader/res/drawable/dottet_line.xml
index da836b12a..2debf098a 100644
--- a/folioreader/res/drawable/dottet_line.xml
+++ b/folioreader/res/drawable/dottet_line.xml
@@ -1,4 +1,4 @@
-
+
diff --git a/folioreader/res/drawable/font_text_selector.xml b/folioreader/res/drawable/font_text_selector.xml
index 0762eb28c..0394fbb8f 100644
--- a/folioreader/res/drawable/font_text_selector.xml
+++ b/folioreader/res/drawable/font_text_selector.xml
@@ -1,7 +1,7 @@
-
-
-
-
+
+
+
+
diff --git a/folioreader/res/drawable/green_border_background.xml b/folioreader/res/drawable/green_border_background.xml
index 0abbd7131..6c9e4d7c0 100644
--- a/folioreader/res/drawable/green_border_background.xml
+++ b/folioreader/res/drawable/green_border_background.xml
@@ -4,5 +4,5 @@
-
+
\ No newline at end of file
diff --git a/folioreader/res/drawable/ic_fast_forward.xml b/folioreader/res/drawable/ic_fast_forward.xml
new file mode 100644
index 000000000..c66e5f529
--- /dev/null
+++ b/folioreader/res/drawable/ic_fast_forward.xml
@@ -0,0 +1,9 @@
+
+
+
diff --git a/folioreader/res/drawable/ic_fast_rewind.xml b/folioreader/res/drawable/ic_fast_rewind.xml
new file mode 100644
index 000000000..234730cf3
--- /dev/null
+++ b/folioreader/res/drawable/ic_fast_rewind.xml
@@ -0,0 +1,9 @@
+
+
+
diff --git a/folioreader/res/drawable/ic_offline_gray_layer_list.xml b/folioreader/res/drawable/ic_offline_gray_layer_list.xml
index 89bd96d66..2b2f4125d 100644
--- a/folioreader/res/drawable/ic_offline_gray_layer_list.xml
+++ b/folioreader/res/drawable/ic_offline_gray_layer_list.xml
@@ -1,4 +1,4 @@
-
+
\ No newline at end of file
diff --git a/folioreader/res/drawable/ic_pause.xml b/folioreader/res/drawable/ic_pause.xml
new file mode 100644
index 000000000..98c36068a
--- /dev/null
+++ b/folioreader/res/drawable/ic_pause.xml
@@ -0,0 +1,9 @@
+
+
+
diff --git a/folioreader/res/drawable/ic_play.xml b/folioreader/res/drawable/ic_play.xml
new file mode 100644
index 000000000..e86ee425e
--- /dev/null
+++ b/folioreader/res/drawable/ic_play.xml
@@ -0,0 +1,9 @@
+
+
+
diff --git a/folioreader/res/drawable/ic_plus_black_24dp.xml b/folioreader/res/drawable/ic_plus_black_24dp.xml
index ce4e94c4e..61814f1ca 100644
--- a/folioreader/res/drawable/ic_plus_black_24dp.xml
+++ b/folioreader/res/drawable/ic_plus_black_24dp.xml
@@ -4,5 +4,7 @@
android:width="24dp"
android:viewportWidth="24"
android:viewportHeight="24">
-
+
\ No newline at end of file
diff --git a/folioreader/res/drawable/ic_volume_gray_24dp.xml b/folioreader/res/drawable/ic_volume_gray_24dp.xml
index 68969151e..a5ff217ae 100644
--- a/folioreader/res/drawable/ic_volume_gray_24dp.xml
+++ b/folioreader/res/drawable/ic_volume_gray_24dp.xml
@@ -4,5 +4,7 @@
android:width="24dp"
android:viewportWidth="24"
android:viewportHeight="24">
-
+
\ No newline at end of file
diff --git a/folioreader/res/drawable/note_edittext_background.xml b/folioreader/res/drawable/note_edittext_background.xml
index ba907dbe3..7dd4d8ee0 100644
--- a/folioreader/res/drawable/note_edittext_background.xml
+++ b/folioreader/res/drawable/note_edittext_background.xml
@@ -1,8 +1,9 @@
-
-
+
-
-
-
+ android:shape="rectangle">
+
+
+
\ No newline at end of file
diff --git a/folioreader/res/drawable/round_button.xml b/folioreader/res/drawable/round_button.xml
index 55204468b..5ce392580 100644
--- a/folioreader/res/drawable/round_button.xml
+++ b/folioreader/res/drawable/round_button.xml
@@ -1,7 +1,8 @@
+ android:shape="rectangle"
+ android:padding="10dp">
-
-
+
+
\ No newline at end of file
diff --git a/folioreader/res/drawable/search_thumb_vertical.xml b/folioreader/res/drawable/search_thumb_vertical.xml
new file mode 100644
index 000000000..2e1c422b6
--- /dev/null
+++ b/folioreader/res/drawable/search_thumb_vertical.xml
@@ -0,0 +1,5 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/folioreader/res/drawable/style_back_color_selector.xml b/folioreader/res/drawable/style_back_color_selector.xml
index 0a911ab19..89605eac4 100644
--- a/folioreader/res/drawable/style_back_color_selector.xml
+++ b/folioreader/res/drawable/style_back_color_selector.xml
@@ -1,7 +1,7 @@
-
-
-
-
+
+
+
+
diff --git a/folioreader/res/drawable/style_text_color_selector.xml b/folioreader/res/drawable/style_text_color_selector.xml
index d04361384..744b3a4e7 100644
--- a/folioreader/res/drawable/style_text_color_selector.xml
+++ b/folioreader/res/drawable/style_text_color_selector.xml
@@ -1,7 +1,7 @@
-
+
-
-
+
+
diff --git a/folioreader/res/drawable/thumb.xml b/folioreader/res/drawable/thumb.xml
index 17f8bff7c..520f85711 100644
--- a/folioreader/res/drawable/thumb.xml
+++ b/folioreader/res/drawable/thumb.xml
@@ -1,12 +1,13 @@
+ android:shape="oval">
-
+
-
+
-
+
\ No newline at end of file
diff --git a/folioreader/res/drawable/transparent_selector.xml b/folioreader/res/drawable/transparent_selector.xml
index 8591e2bf0..a3a75f9f4 100644
--- a/folioreader/res/drawable/transparent_selector.xml
+++ b/folioreader/res/drawable/transparent_selector.xml
@@ -1,7 +1,7 @@
-
-
-
-
+
+
+
+
\ No newline at end of file
diff --git a/folioreader/res/layout/action_item_horizontal.xml b/folioreader/res/layout/action_item_horizontal.xml
index c6e721128..0591ca351 100644
--- a/folioreader/res/layout/action_item_horizontal.xml
+++ b/folioreader/res/layout/action_item_horizontal.xml
@@ -1,28 +1,27 @@
-
+
+ android:id="@+id/iv_icon"
+ android:layout_centerHorizontal="true"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content" />
+ android:id="@+id/tv_title"
+ android:layout_below="@+id/iv_icon"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_centerHorizontal="true"
+ android:gravity="center_horizontal"
+ android:paddingLeft="5dip"
+ android:paddingRight="5dip"
+ android:text="Chart"
+ android:textColor="#fff" />
\ No newline at end of file
diff --git a/folioreader/res/layout/action_item_vertical.xml b/folioreader/res/layout/action_item_vertical.xml
index b16fa2124..103b29f17 100644
--- a/folioreader/res/layout/action_item_vertical.xml
+++ b/folioreader/res/layout/action_item_vertical.xml
@@ -1,25 +1,24 @@
-
+
+ android:id="@+id/iv_icon"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content" />
+ android:id="@+id/tv_title"
+ android:layout_width="fill_parent"
+ android:layout_height="fill_parent"
+ android:gravity="center_vertical"
+ android:paddingLeft="5dip"
+ android:paddingRight="10dip"
+ android:text="Chart"
+ android:textColor="#fff" />
\ No newline at end of file
diff --git a/folioreader/res/layout/activity_content_highlight.xml b/folioreader/res/layout/activity_content_highlight.xml
index 0c291e3dc..fb6535cf0 100644
--- a/folioreader/res/layout/activity_content_highlight.xml
+++ b/folioreader/res/layout/activity_content_highlight.xml
@@ -4,9 +4,9 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
- tools:context="com.folioreader.ui.folio.activity.ContentHighlightActivity">
+ tools:context="com.folioreader.ui.activity.ContentHighlightActivity">
-
-
-
+
+ android:layout_below="@id/toolbar" />
diff --git a/folioreader/res/layout/activity_search.xml b/folioreader/res/layout/activity_search.xml
index 337761b13..8579a3602 100644
--- a/folioreader/res/layout/activity_search.xml
+++ b/folioreader/res/layout/activity_search.xml
@@ -1,23 +1,27 @@
-
+ tools:context="com.folioreader.ui.activity.SearchActivity"
+ tools:menu="@menu/menu_search">
-
+ app:layout_constraintTop_toTopOf="parent"
+ tools:listitem="@layout/item_search_normal" />
-
-
-
+
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/folioreader/res/layout/dialog_edit_notes.xml b/folioreader/res/layout/dialog_edit_notes.xml
index 89ed00460..4b2954084 100644
--- a/folioreader/res/layout/dialog_edit_notes.xml
+++ b/folioreader/res/layout/dialog_edit_notes.xml
@@ -1,16 +1,17 @@
+
+
+
+
diff --git a/folioreader/res/layout/folio_activity.xml b/folioreader/res/layout/folio_activity.xml
index 70fcc65be..b4a01b5ee 100644
--- a/folioreader/res/layout/folio_activity.xml
+++ b/folioreader/res/layout/folio_activity.xml
@@ -1,14 +1,14 @@
-
+ tools:context="com.folioreader.ui.activity.FolioActivity"
+ tools:menu="@menu/menu_main">
-
-
-
-
+
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/folioreader/res/layout/folio_page_fragment.xml b/folioreader/res/layout/folio_page_fragment.xml
index 7415be09d..50c879c24 100644
--- a/folioreader/res/layout/folio_page_fragment.xml
+++ b/folioreader/res/layout/folio_page_fragment.xml
@@ -13,26 +13,26 @@
android:layout_height="match_parent"
android:layout_above="@+id/indicatorLayout">
-
-
-
-
+ tools:context="com.folioreader.ui.fragment.TableOfContentFragment">
-
-
diff --git a/folioreader/res/layout/horiz_separator.xml b/folioreader/res/layout/horiz_separator.xml
index 59a85b115..8aa80cb1b 100644
--- a/folioreader/res/layout/horiz_separator.xml
+++ b/folioreader/res/layout/horiz_separator.xml
@@ -1,12 +1,13 @@
-
-
+
+
+
diff --git a/folioreader/res/layout/item_search_empty.xml b/folioreader/res/layout/item_search_empty.xml
index 87d15e544..6a8a722bf 100644
--- a/folioreader/res/layout/item_search_empty.xml
+++ b/folioreader/res/layout/item_search_empty.xml
@@ -1,5 +1,5 @@
-
@@ -14,4 +14,4 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/folioreader/res/layout/item_search_failure.xml b/folioreader/res/layout/item_search_failure.xml
index bc78b7256..9ecc27410 100644
--- a/folioreader/res/layout/item_search_failure.xml
+++ b/folioreader/res/layout/item_search_failure.xml
@@ -1,5 +1,5 @@
-
@@ -14,4 +14,4 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/folioreader/res/layout/item_search_init.xml b/folioreader/res/layout/item_search_init.xml
index 78e2893c7..f586e583a 100644
--- a/folioreader/res/layout/item_search_init.xml
+++ b/folioreader/res/layout/item_search_init.xml
@@ -1,5 +1,5 @@
-
@@ -13,4 +13,4 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/folioreader/res/layout/item_search_loading.xml b/folioreader/res/layout/item_search_loading.xml
index 02b967af9..c2537508c 100644
--- a/folioreader/res/layout/item_search_loading.xml
+++ b/folioreader/res/layout/item_search_loading.xml
@@ -1,4 +1,4 @@
-
\ No newline at end of file
diff --git a/folioreader/res/layout/item_search_normal.xml b/folioreader/res/layout/item_search_normal.xml
index 18a2379d8..aaaec6699 100644
--- a/folioreader/res/layout/item_search_normal.xml
+++ b/folioreader/res/layout/item_search_normal.xml
@@ -1,5 +1,5 @@
-
+ tools:text="...republishers to fill in for you as you focus on print and quick-and-dirty ebooks, but a content imperative vital to your survival in the digital future, as I’ll take the odd detour from the planned route to point out..." />
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/folioreader/res/layout/item_search_pagination_in_progress.xml b/folioreader/res/layout/item_search_pagination_in_progress.xml
new file mode 100644
index 000000000..9e1ba14da
--- /dev/null
+++ b/folioreader/res/layout/item_search_pagination_in_progress.xml
@@ -0,0 +1,15 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/folioreader/res/layout/layout_dictionary.xml b/folioreader/res/layout/layout_dictionary.xml
index 51d76d46f..6929fd78f 100644
--- a/folioreader/res/layout/layout_dictionary.xml
+++ b/folioreader/res/layout/layout_dictionary.xml
@@ -5,7 +5,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent">
-
-
+
-
+ tools:visibility="visible" />
\ No newline at end of file
diff --git a/folioreader/res/layout/popup_horizontal.xml b/folioreader/res/layout/popup_horizontal.xml
index c3d1095fb..f381be1f0 100644
--- a/folioreader/res/layout/popup_horizontal.xml
+++ b/folioreader/res/layout/popup_horizontal.xml
@@ -1,41 +1,39 @@
-
+
+ android:id="@+id/scroller"
+ android:layout_marginTop="16dip"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:background="@drawable/popup"
+ android:fadingEdgeLength="5dip"
+ android:scrollbars="none">
+ android:id="@+id/tracks"
+ android:orientation="horizontal"
+ android:layout_width="wrap_content"
+ android:layout_height="fill_parent"
+ android:layout_weight="1"
+ android:padding="10dip" />
+ android:id="@+id/arrow_up"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:src="@drawable/arrow_up" />
+ android:id="@+id/arrow_down"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_below="@id/scroller"
+ android:layout_marginTop="-4dip"
+ android:src="@drawable/arrow_down" />
\ No newline at end of file
diff --git a/folioreader/res/layout/popup_vertical.xml b/folioreader/res/layout/popup_vertical.xml
index 2a97b50ca..18cdd5a3b 100644
--- a/folioreader/res/layout/popup_vertical.xml
+++ b/folioreader/res/layout/popup_vertical.xml
@@ -1,41 +1,39 @@
-
+
+
+ android:background="@drawable/popup"
+ android:fadingEdgeLength="5dip"
+ android:scrollbars="none">
-
-
-
+ android:layout_weight="1"
+ android:padding="10dip" />
+ android:id="@+id/arrow_up"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:src="@drawable/arrow_up" />
+ android:id="@+id/arrow_down"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_below="@id/scroller"
+ android:layout_marginTop="-4dip"
+ android:src="@drawable/arrow_down" />
\ No newline at end of file
diff --git a/folioreader/res/layout/progress_dialog.xml b/folioreader/res/layout/progress_dialog.xml
index 56235981d..0d823fe0e 100644
--- a/folioreader/res/layout/progress_dialog.xml
+++ b/folioreader/res/layout/progress_dialog.xml
@@ -2,21 +2,27 @@
-
-
-
-
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/folioreader/res/layout/row_font.xml b/folioreader/res/layout/row_font.xml
index 8f7783c2e..bcefd5065 100644
--- a/folioreader/res/layout/row_font.xml
+++ b/folioreader/res/layout/row_font.xml
@@ -1,8 +1,8 @@
\ No newline at end of file
+ android:id="@+id/name"
+ android:layout_width="wrap_content"
+ android:layout_height="match_parent"
+ android:textSize="24sp"
+ android:gravity="center_vertical"
+ android:padding="16dp" />
\ No newline at end of file
diff --git a/folioreader/res/layout/row_highlight.xml b/folioreader/res/layout/row_highlight.xml
index 88755847e..027592e89 100644
--- a/folioreader/res/layout/row_highlight.xml
+++ b/folioreader/res/layout/row_highlight.xml
@@ -43,7 +43,7 @@
android:textSize="14sp"
android:textStyle="bold" />
-
-
-
@@ -103,8 +103,8 @@
-
+
-
+
\ No newline at end of file
diff --git a/folioreader/res/layout/view_audio_player.xml b/folioreader/res/layout/view_audio_player.xml
index 953ffa9a3..db4fc9738 100644
--- a/folioreader/res/layout/view_audio_player.xml
+++ b/folioreader/res/layout/view_audio_player.xml
@@ -24,15 +24,15 @@
android:layout_height="match_parent"
android:layout_weight="0.2"
android:background="@android:color/transparent"
- android:src="@drawable/prev_con" />
+ app:srcCompat="@drawable/ic_fast_rewind" />
+ app:srcCompat="@drawable/ic_play" />
+ app:srcCompat="@drawable/ic_fast_forward" />
-
-
-
-
-
-
-
-
-
-
-
-
-
+
diff --git a/folioreader/res/layout/view_loading.xml b/folioreader/res/layout/view_loading.xml
index aeb3271ba..2db55cd04 100644
--- a/folioreader/res/layout/view_loading.xml
+++ b/folioreader/res/layout/view_loading.xml
@@ -2,10 +2,10 @@
+ tools:parentTag="androidx.constraintlayout.widget.ConstraintLayout">
+ tools:indeterminateTint="@color/default_theme_accent_color" />
\ No newline at end of file
diff --git a/folioreader/res/layout/view_webview_pager.xml b/folioreader/res/layout/view_webview_pager.xml
index e94ed64b1..c6b233746 100644
--- a/folioreader/res/layout/view_webview_pager.xml
+++ b/folioreader/res/layout/view_webview_pager.xml
@@ -1,5 +1,5 @@
-
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/folioreader/res/menu/menu_main.xml b/folioreader/res/menu/menu_main.xml
index c49fa85ca..442709c10 100644
--- a/folioreader/res/menu/menu_main.xml
+++ b/folioreader/res/menu/menu_main.xml
@@ -2,7 +2,7 @@