Merge branch 'feature/component' into 'develop'

callback added See merge request !3
scottyoon90 · Nov 25, 2016 · 9426d6b · 9426d6b
2 parents bed6c16 + bf83069
commit 9426d6b
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 0 deletions.
diff --git a/library/src/main/java/com/yalantis/jellytoolbar/listener/JellyListener.kt b/library/src/main/java/com/yalantis/jellytoolbar/listener/JellyListener.kt
@@ -0,0 +1,16 @@
+package com.yalantis.jellytoolbar.listener
+
+/**
+ * Created by irinagalata on 11/25/16.
+ */
+interface JellyListener {
+
+    fun onToolbarExpandingStarted()
+
+    fun onToolbarCollapsingStarted()
+
+    fun onToolbarExpanded()
+
+    fun onToolbarCollapsed()
+
+}
diff --git a/library/src/main/java/com/yalantis/jellytoolbar/widget/JellyToolbar.kt b/library/src/main/java/com/yalantis/jellytoolbar/widget/JellyToolbar.kt
@@ -9,7 +9,9 @@ import android.util.AttributeSet
 import android.view.LayoutInflater
 import android.view.View
 import android.widget.FrameLayout
+import com.yalantis.jellytoolbar.Constant
 import com.yalantis.jellytoolbar.R
+import com.yalantis.jellytoolbar.listener.JellyListener
 import kotlinx.android.synthetic.main.jelly_toolbar.view.*
 
 /**
@@ -42,6 +44,7 @@ class JellyToolbar : FrameLayout, JellyWidget {
         set(value) {
             value?.let { jellyView.endColor = value }
         }
+    var jellyListener: JellyListener? = null
 
     private var mIsExpanded = false
 
@@ -86,6 +89,8 @@ class JellyToolbar : FrameLayout, JellyWidget {
         jellyView.collapse()
         contentLayout.collapse()
         mIsExpanded = false
+        jellyListener?.onToolbarCollapsingStarted()
+        postDelayed({ jellyListener?.onToolbarCollapsed() }, Constant.ANIMATION_DURATION)
     }
 
     override fun expand() {
@@ -94,6 +99,8 @@ class JellyToolbar : FrameLayout, JellyWidget {
         jellyView.expand()
         contentLayout.expand()
         mIsExpanded = true
+        jellyListener?.onToolbarExpandingStarted()
+        postDelayed({ jellyListener?.onToolbarExpanded() }, Constant.ANIMATION_DURATION)
     }
 
 }