Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: TangoAgency/material-intro-screen
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: master
Choose a base ref
...
head repository: Ualabee/material-intro-screen
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
Able to merge. These branches can be automatically merged.
  • 1 commit
  • 4 files changed
  • 1 contributor

Commits on Nov 20, 2018

  1. androidx compatible

    @frapeti
    frapeti committed Nov 20, 2018

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    663ece3 View commit details
2 changes: 1 addition & 1 deletion ...n/java/agency/tango/materialintroscreen/listeners/ViewBehavioursOnPageChangeListener.java
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package agency.tango.materialintroscreen.listeners;

import android.support.v4.view.CustomViewPager;
import agency.tango.materialintroscreen.widgets.CustomViewPager;

import java.util.ArrayList;
import java.util.List;
27 changes: 18 additions & 9 deletions ...roid/support/v4/view/CustomViewPager.java → ...lintroscreen/widgets/CustomViewPager.java
View file
Original file line number Diff line number Diff line change
@@ -14,7 +14,7 @@
* limitations under the License.
*/

package android.support.v4.view;
package agency.tango.materialintroscreen.widgets;

import android.content.Context;
import android.content.res.Resources;
@@ -34,6 +34,13 @@
import android.support.annotation.Nullable;
import android.support.v4.os.ParcelableCompat;
import android.support.v4.os.ParcelableCompatCreatorCallbacks;
import android.support.v4.view.AbsSavedState;
import android.support.v4.view.AccessibilityDelegateCompat;
import android.support.v4.view.MotionEventCompat;
import android.support.v4.view.PagerAdapter;
import android.support.v4.view.VelocityTrackerCompat;
import android.support.v4.view.ViewCompat;
import android.support.v4.view.WindowInsetsCompat;
import android.support.v4.view.accessibility.AccessibilityEventCompat;
import android.support.v4.view.accessibility.AccessibilityNodeInfoCompat;
import android.support.v4.view.accessibility.AccessibilityRecordCompat;
@@ -506,7 +513,8 @@ private void setScrollState(int newState) {
*/
public void setAdapter(PagerAdapter adapter) {
if (mAdapter != null) {
mAdapter.setViewPagerObserver(null);
//mAdapter.setViewPagerObserver(null);
mAdapter.unregisterDataSetObserver(mObserver);
mAdapter.startUpdate(this);
for (int i = 0; i < mItems.size(); i++) {
final ItemInfo ii = mItems.get(i);
@@ -527,7 +535,8 @@ public void setAdapter(PagerAdapter adapter) {
if (mObserver == null) {
mObserver = new PagerObserver();
}
mAdapter.setViewPagerObserver(mObserver);
//mAdapter.setViewPagerObserver(mObserver);
mAdapter.registerDataSetObserver(mObserver);
mPopulatePending = false;
final boolean wasFirstLayout = mFirstLayout;
mFirstLayout = true;
@@ -780,7 +789,7 @@ void setChildrenDrawingOrderEnabledCompat(boolean enable) {
if (mSetChildrenDrawingOrderEnabled == null) {
try {
mSetChildrenDrawingOrderEnabled = ViewGroup.class.getDeclaredMethod(
"setChildrenDrawingOrderEnabled", new Class[] { Boolean.TYPE });
"setChildrenDrawingOrderEnabled", Boolean.TYPE);
} catch (NoSuchMethodException e) {
Log.e(TAG, "Can't find setChildrenDrawingOrderEnabled", e);
}
@@ -1174,7 +1183,7 @@ void populate(int newCurrentItem) {
mAdapter.destroyItem(this, pos, ii.object);
if (DEBUG) {
Log.i(TAG, "populate() - destroyItem() with pos: " + pos
+ " view: " + ((View) ii.object));
+ " view: " + ii.object);
}
itemIndex--;
curIndex--;
@@ -1208,7 +1217,7 @@ void populate(int newCurrentItem) {
mAdapter.destroyItem(this, pos, ii.object);
if (DEBUG) {
Log.i(TAG, "populate() - destroyItem() with pos: " + pos
+ " view: " + ((View) ii.object));
+ " view: " + ii.object);
}
ii = itemIndex < mItems.size() ? mItems.get(itemIndex) : null;
}
@@ -1755,7 +1764,7 @@ protected void onLayout(boolean changed, int l, int t, int r, int b) {
(int) (childWidth * lp.widthFactor),
MeasureSpec.EXACTLY);
final int heightSpec = MeasureSpec.makeMeasureSpec(
(int) (height - paddingTop - paddingBottom),
(height - paddingTop - paddingBottom),
MeasureSpec.EXACTLY);
child.measure(widthSpec, heightSpec);
}
@@ -2755,9 +2764,9 @@ public boolean executeKeyEvent(KeyEvent event) {
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)) {
if (event.hasNoModifiers()) {
handled = arrowScroll(FOCUS_FORWARD);
} else if (KeyEventCompat.hasModifiers(event, KeyEvent.META_SHIFT_ON)) {
} else if (event.hasModifiers(KeyEvent.META_SHIFT_ON)) {
handled = arrowScroll(FOCUS_BACKWARD);
}
}
2 changes: 1 addition & 1 deletion ...intro-screen/src/main/java/agency/tango/materialintroscreen/widgets/InkPageIndicator.java
View file
Original file line number Diff line number Diff line change
@@ -14,7 +14,7 @@
import android.os.Parcel;
import android.os.Parcelable;
import android.support.v4.view.ViewCompat;
import android.support.v4.view.CustomViewPager;
import agency.tango.materialintroscreen.widgets.CustomViewPager;
import android.support.v4.view.animation.FastOutSlowInInterpolator;
import android.util.AttributeSet;
import android.view.View;
2 changes: 1 addition & 1 deletion ...tro-screen/src/main/java/agency/tango/materialintroscreen/widgets/SwipeableViewPager.java
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package agency.tango.materialintroscreen.widgets;

import android.content.Context;
import android.support.v4.view.CustomViewPager;
import agency.tango.materialintroscreen.widgets.CustomViewPager;
import android.support.v4.view.MotionEventCompat;
import android.util.AttributeSet;
import android.view.KeyEvent;