Update dependencies, lock orientation while intro is running, add pos…

…ition navigation blocked listener, clean up SlideFragment
janheinrichmerker · Mar 21, 2017 · dbae320 · dbae320
1 parent 615fdf3
commit dbae320
Show file tree

Hide file tree

Showing 6 changed files with 78 additions and 24 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -40,9 +40,9 @@ android {
 dependencies {
     compile project(':library')
     //Support
-    compile 'com.android.support:appcompat-v7:25.2.0'
-    compile 'com.android.support:support-v4:25.2.0'
-    compile 'com.android.support:design:25.2.0'
+    compile 'com.android.support:appcompat-v7:25.3.0'
+    compile 'com.android.support:support-v4:25.3.0'
+    compile 'com.android.support:design:25.3.0'
     //Firebase
     compile 'com.google.firebase:firebase-core:10.2.0'
     compile 'com.google.firebase:firebase-crash:10.2.0'

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Thu Mar 09 14:27:07 CET 2017
-distributionBase=GRADLE_USER_HOME
-distributionPath=wrapper/dists
-zipStoreBase=GRADLE_USER_HOME
-zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip
+#Thu Mar 09 14:27:07 CET 2017
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip
diff --git a/library/build.gradle b/library/build.gradle
@@ -27,5 +27,5 @@ android {
 }
 
 dependencies {
-    compile 'com.android.support:appcompat-v7:25.2.0'
+    compile 'com.android.support:appcompat-v7:25.3.0'
 }
diff --git a/library/src/main/java/com/heinrichreimersoftware/materialintro/app/IntroActivity.java b/library/src/main/java/com/heinrichreimersoftware/materialintro/app/IntroActivity.java
@@ -8,7 +8,9 @@
 import android.annotation.TargetApi;
 import android.app.ActivityManager;
 import android.content.Intent;
+import android.content.pm.ActivityInfo;
 import android.content.res.ColorStateList;
+import android.content.res.Configuration;
 import android.content.res.Resources;
 import android.content.res.TypedArray;
 import android.graphics.Bitmap;
@@ -142,6 +144,8 @@ public class IntroActivity extends AppCompatActivity {
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
 
+        lockOrientation();
+
         pageScrollInterpolator = AnimationUtils.loadInterpolator(this, android.R.interpolator.accelerate_decelerate);
         pageScrollDuration = getResources().getInteger(android.R.integer.config_shortAnimTime);
 
@@ -240,6 +244,8 @@ public Intent onSendActivityResult(int result) {
     protected void onDestroy() {
         if (isAutoplaying())
             cancelAutoplay();
+
+        unlockOrientation();
         super.onDestroy();
     }
 
@@ -885,6 +891,26 @@ private void updateButtonBackDrawable() {
         }
     }
 
+    private void lockOrientation() {
+        int orientation;
+        int rotation = getResources().getConfiguration().orientation;
+        switch (rotation) {
+            case Configuration.ORIENTATION_LANDSCAPE:
+                orientation = ActivityInfo.SCREEN_ORIENTATION_SENSOR_LANDSCAPE;
+                break;
+            case Configuration.ORIENTATION_PORTRAIT:
+            default:
+                orientation = ActivityInfo.SCREEN_ORIENTATION_SENSOR_PORTRAIT;
+                break;
+        }
+
+        setRequestedOrientation(orientation);
+    }
+
+    private void unlockOrientation() {
+        setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_UNSPECIFIED);
+    }
+
     @SuppressWarnings("unused")
     public void autoplay(@IntRange(from = 1) long delay, @IntRange(from = -1) int repeatCount) {
         autoplayCounter = repeatCount;
@@ -1223,6 +1249,11 @@ public Slide getSlide(int location) {
         return adapter.getSlide(location);
     }
 
+    @SuppressWarnings("unused")
+    public int getSlidePosition(Slide slide) {
+        return adapter.getItemPosition(slide);
+    }
+
     @SuppressWarnings("unused")
     public Fragment getItem(int position) {
         return adapter.getItem(position);

diff --git a/...ava/com/heinrichreimersoftware/materialintro/app/OnPositionNavigationBlockedListener.java b/...ava/com/heinrichreimersoftware/materialintro/app/OnPositionNavigationBlockedListener.java
@@ -0,0 +1,22 @@
+package com.heinrichreimersoftware.materialintro.app;
+
+public abstract class OnPositionNavigationBlockedListener implements OnNavigationBlockedListener {
+    private final int position;
+
+    public OnPositionNavigationBlockedListener(int position) {
+        this.position = position;
+    }
+
+    public int getPosition() {
+        return position;
+    }
+
+    protected abstract void onNavigationBlocked(@Direction int direction);
+
+    @Override
+    public void onNavigationBlocked(int position, @Direction int direction) {
+        if (this.position == position) {
+            onNavigationBlocked(direction);
+        }
+    }
+}
diff --git a/library/src/main/java/com/heinrichreimersoftware/materialintro/app/SlideFragment.java b/library/src/main/java/com/heinrichreimersoftware/materialintro/app/SlideFragment.java
@@ -13,36 +13,37 @@ public boolean canGoBackward() {
         return true;
     }
 
-    public void updateNavigation() {
+    public IntroActivity getIntroActivity() {
         if (getActivity() instanceof IntroActivity) {
-            ((IntroActivity) getActivity()).lockSwipeIfNeeded();
+            return (IntroActivity) getActivity();
+        } else {
+            throw new IllegalStateException("SlideFragment's must be attached to an IntroActivity.");
         }
     }
 
+    public void updateNavigation() {
+        getIntroActivity().lockSwipeIfNeeded();
+    }
+
     public void addOnNavigationBlockedListener(OnNavigationBlockedListener listener) {
-        if (getActivity() instanceof IntroActivity) {
-            ((IntroActivity) getActivity()).addOnNavigationBlockedListener(listener);
-        }
+        getIntroActivity().addOnNavigationBlockedListener(listener);
     }
 
     public void removeOnNavigationBlockedListener(OnNavigationBlockedListener listener) {
-        if (getActivity() instanceof IntroActivity) {
-            ((IntroActivity) getActivity()).removeOnNavigationBlockedListener(listener);
-        }
+        getIntroActivity().removeOnNavigationBlockedListener(listener);
     }
 
     protected void nextSlide() {
-        if (getActivity() instanceof IntroActivity) {
-            ((IntroActivity) getActivity()).nextSlide();
-        }
+        getIntroActivity().nextSlide();
     }
 
     protected void previousSlide() {
-        if (getActivity() instanceof IntroActivity) {
-            ((IntroActivity) getActivity()).previousSlide();
-        }
+        getIntroActivity().previousSlide();
     }
 
+    /**
+     * @deprecated
+     */
     public View getContentView() {
         return getActivity().findViewById(android.R.id.content);
     }