Merge remote-tracking branch 'upstream/master'

janheinrichmerker · Mar 1, 2016 · dcac485 · dcac485
2 parents 0803a67 + b422511
commit dcac485
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 9 deletions.
diff --git a/README.md b/README.md
@@ -1,6 +1,7 @@
 material-intro
 =======================
 
+[![Android Arsenal][23]][24]
 [![jitpack.io][18]][4]
 [![Build Status][19]][20]
 [![Apache License 2.0][21]][22]
@@ -191,3 +192,5 @@ License
 [20]: https://travis-ci.org/HeinrichReimer/material-intro
 [21]: https://img.shields.io/github/license/HeinrichReimer/material-intro.svg
 [22]: https://www.apache.org/licenses/LICENSE-2.0.html
+[23]: https://img.shields.io/badge/Android%20Arsenal-material--intro-green.svg?style=true
+[24]: https://android-arsenal.com/details/1/3206
diff --git a/app/build.gradle b/app/build.gradle
@@ -25,6 +25,6 @@ android {
 dependencies {
     compile fileTree(dir: 'libs', include: ['*.jar'])
     compile project(':library')
-    compile 'com.android.support:appcompat-v7:23.1.1'
-    compile 'com.android.support:support-v4:23.1.1'
+    compile 'com.android.support:appcompat-v7:23.2.0'
+    compile 'com.android.support:support-v4:23.2.0'
 }
diff --git a/library/build.gradle b/library/build.gradle
@@ -23,5 +23,5 @@ android {
 
 dependencies {
     compile fileTree(dir: 'libs', include: ['*.jar'])
-    compile 'com.android.support:appcompat-v7:23.1.1'
+    compile 'com.android.support:appcompat-v7:23.2.0'
 }
diff --git a/library/src/main/java/com/heinrichreimersoftware/materialintro/view/FadeableViewPager.java b/library/src/main/java/com/heinrichreimersoftware/materialintro/view/FadeableViewPager.java
@@ -85,6 +85,17 @@ private class PagerAdapterWrapper extends PagerAdapter{
 
         private PagerAdapterWrapper(PagerAdapter adapter) {
             this.adapter = adapter;
+            adapter.registerDataSetObserver(new DataSetObserver() {
+                @Override
+                public void onChanged() {
+                    notifyDataSetChanged();
+                }
+
+                @Override
+                public void onInvalidated() {
+                    notifyDataSetChanged();
+                }
+            });
         }
 
         public PagerAdapter getAdapter() {
@@ -186,11 +197,6 @@ public int getItemPosition(Object object) {
             return POSITION_NONE;
         }
 
-        @Override
-        public void notifyDataSetChanged() {
-            adapter.notifyDataSetChanged();
-        }
-
         @Override
         public void registerDataSetObserver(DataSetObserver observer) {
             adapter.registerDataSetObserver(observer);

diff --git a/library/src/main/res/layout/fragment_simple_slide.xml b/library/src/main/res/layout/fragment_simple_slide.xml
@@ -6,7 +6,8 @@
     android:layout_gravity="center"
     android:gravity="center"
     android:orientation="vertical"
-    android:padding="@dimen/mi_baseline">
+    android:padding="@dimen/mi_baseline"
+    android:clipToPadding="false">
 
     <TextView
         android:id="@id/mi_title"