Integrating a listener in the config to get callbacks

reynlu · Feb 24, 2015 · a359d1c · a359d1c
1 parent ba73893
commit a359d1c
Show file tree

Hide file tree

Showing 10 changed files with 79 additions and 6 deletions.
diff --git a/.idea/libraries/cardview_v7_21_0_3.xml b/.idea/libraries/cardview_v7_21_0_3.xml
diff --git a/.idea/libraries/recyclerview_v7_21_0_3.xml b/.idea/libraries/recyclerview_v7_21_0_3.xml
diff --git a/.idea/libraries/support_v4_21_0_3.xml b/.idea/libraries/support_v4_21_0_3.xml
diff --git a/example/build.gradle b/example/build.gradle
@@ -6,7 +6,7 @@ repositories {
 
 android {
     compileSdkVersion 21
-    buildToolsVersion "21.1.1"
+    buildToolsVersion "21.1.2"
 
     defaultConfig {
         applicationId "com.r0adkll.slidr.example"

diff --git a/example/example.iml b/example/example.iml
@@ -86,10 +86,10 @@
     <orderEntry type="jdk" jdkName="Android API 21 Platform" jdkType="Android SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" exported="" name="gson-2.3.1" level="project" />
-    <orderEntry type="library" exported="" name="timber-2.5.2-SNAPSHOT" level="project" />
     <orderEntry type="library" exported="" name="appcompat-v7-21.0.3" level="project" />
     <orderEntry type="library" exported="" name="deadskunk-1.0.4-SNAPSHOT" level="project" />
     <orderEntry type="library" exported="" name="support-annotations-21.0.3" level="project" />
+    <orderEntry type="library" exported="" name="timber-2.7.2-SNAPSHOT" level="project" />
     <orderEntry type="library" exported="" name="support-v4-21.0.3" level="project" />
     <orderEntry type="library" exported="" name="butterknife-6.0.0" level="project" />
     <orderEntry type="library" exported="" name="cardview-v7-21.0.3" level="project" />

diff --git a/library/library.iml b/library/library.iml
@@ -62,6 +62,7 @@
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
+      <excludeFolder url="file://$MODULE_DIR$/build/docs" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/bundles" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
@@ -81,7 +82,9 @@
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
+      <excludeFolder url="file://$MODULE_DIR$/build/libs" />
       <excludeFolder url="file://$MODULE_DIR$/build/outputs" />
+      <excludeFolder url="file://$MODULE_DIR$/build/poms" />
       <excludeFolder url="file://$MODULE_DIR$/build/tmp" />
     </content>
     <orderEntry type="jdk" jdkName="Android API 21 Platform" jdkType="Android SDK" />

diff --git a/library/src/main/java/com/r0adkll/slidr/Slidr.java b/library/src/main/java/com/r0adkll/slidr/Slidr.java
@@ -130,12 +130,20 @@ public static SlidrInterface attach(final Activity activity, final SlidrConfig c
 
             @Override
             public void onClosed() {
+                if(config.getListener() != null){
+                    config.getListener().onSlideClosed();
+                }
+
                 activity.finish();
                 activity.overridePendingTransition(0, 0);
             }
 
             @Override
-            public void onOpened() {}
+            public void onOpened() {
+                if(config.getListener() != null){
+                    config.getListener().onSlideOpened();
+                }
+            }
 
             @TargetApi(Build.VERSION_CODES.LOLLIPOP)
             @Override
@@ -150,6 +158,10 @@ public void onSlideChange(float percent) {
 
                     activity.getWindow().setStatusBarColor(newColor);
                 }
+
+                if(config.getListener() != null){
+                    config.getListener().onSlideChange(percent);
+                }
             }
         });
 

diff --git a/library/src/main/java/com/r0adkll/slidr/model/SlidrConfig.java b/library/src/main/java/com/r0adkll/slidr/model/SlidrConfig.java
@@ -13,6 +13,7 @@ public class SlidrConfig {
     private SlidrPosition position = SlidrPosition.LEFT;
     private float touchSize = -1f;
     private float sensitivity = 1f;
+    private SlidrListener listener;
 
     /**
      * Hidden Constructor
@@ -70,6 +71,10 @@ public float getSensitivity(){
         return sensitivity;
     }
 
+    public SlidrListener getListener(){
+        return listener;
+    }
+
     /**
      * Return whether or not the set status bar colors are valid
      * @return
@@ -115,6 +120,11 @@ public Builder sensitivity(float sensitivity){
             return this;
         }
 
+        public Builder listener(SlidrListener listener){
+            config.listener = listener;
+            return this;
+        }
+
         public SlidrConfig build(){
             return config;
         }

diff --git a/library/src/main/java/com/r0adkll/slidr/model/SlidrListener.java b/library/src/main/java/com/r0adkll/slidr/model/SlidrListener.java
@@ -0,0 +1,19 @@
+package com.r0adkll.slidr.model;
+
+/**
+ * This listener interface is for receiving events from the sliding panel such as state changes
+ * and slide progress
+ *
+ * Project: Slidr
+ * Package: com.r0adkll.slidr.model
+ * Created by drew.heavner on 2/24/15.
+ */
+public interface SlidrListener {
+
+    public void onSlideChange(float percent);
+
+    public void onSlideOpened();
+
+    public void onSlideClosed();
+
+}
diff --git a/library/src/main/java/com/r0adkll/slidr/model/SlidrListenerAdapter.java b/library/src/main/java/com/r0adkll/slidr/model/SlidrListenerAdapter.java
@@ -0,0 +1,23 @@
+package com.r0adkll.slidr.model;
+
+/**
+ * Project: Slidr
+ * Package: com.r0adkll.slidr.model
+ * Created by drew.heavner on 2/24/15.
+ */
+public class SlidrListenerAdapter implements SlidrListener{
+    @Override
+    public void onSlideChange(float percent) {
+
+    }
+
+    @Override
+    public void onSlideOpened() {
+
+    }
+
+    @Override
+    public void onSlideClosed() {
+
+    }
+}