Refactor unit lambda functions

skydoves · Sep 20, 2020 · 3090e2e · 3090e2e
1 parent 6a02525
commit 3090e2e
Show file tree

Hide file tree

Showing 7 changed files with 16 additions and 27 deletions.
diff --git a/elasticviews/src/main/java/com/skydoves/elasticviews/ElasticAnimation.kt b/elasticviews/src/main/java/com/skydoves/elasticviews/ElasticAnimation.kt
@@ -91,19 +91,18 @@ class ElasticAnimation(private val view: View) {
         .scaleX(this.scaleX)
         .scaleY(this.scaleY)
         .setInterpolator(CycleInterpolator(0.5f)).apply {
-          setListener(object : ViewPropertyAnimatorListener {
+          listener?.let { setListener(it) } ?: setListener(object : ViewPropertyAnimatorListener {
             override fun onAnimationCancel(view: View?) = Unit
             override fun onAnimationStart(view: View?) {
               isAnimating = true
             }
 
             override fun onAnimationEnd(view: View?) {
-              isAnimating = false
               finishListener?.onFinished()
+              isAnimating = false
             }
           })
         }
-      this.listener?.let { animatorCompat.setListener(it) }
       if (this.view is ViewGroup) {
         for (index in 0 until this.view.childCount) {
           val nextChild = this.view.getChildAt(index)

diff --git a/elasticviews/src/main/java/com/skydoves/elasticviews/ElasticButton.kt b/elasticviews/src/main/java/com/skydoves/elasticviews/ElasticButton.kt
@@ -41,6 +41,7 @@ class ElasticButton @JvmOverloads constructor(
 
   var scale = 0.9f
   var duration = 500
+
   @Px
   var cornerRadius = 0f
 
@@ -130,8 +131,7 @@ class ElasticButton @JvmOverloads constructor(
 
     @JvmSynthetic
     fun setOnClickListener(block: () -> Unit) = apply {
-      val onClickListener = OnClickListener { block() }
-      this.elasticButton.setOnClickListener(onClickListener)
+      setOnClickListener(OnClickListener { block() })
     }
 
     fun setOnClickListener(value: OnClickListener) = apply {
@@ -140,8 +140,7 @@ class ElasticButton @JvmOverloads constructor(
 
     @JvmSynthetic
     fun setOnFinishListener(block: () -> Unit) = apply {
-      val onElasticFinishListener = ElasticFinishListener { block() }
-      this.elasticButton.setOnFinishListener(onElasticFinishListener)
+      setOnFinishListener(ElasticFinishListener { block() })
     }
 
     fun setOnFinishListener(value: ElasticFinishListener) = apply {

diff --git a/elasticviews/src/main/java/com/skydoves/elasticviews/ElasticCardView.kt b/elasticviews/src/main/java/com/skydoves/elasticviews/ElasticCardView.kt
@@ -109,8 +109,7 @@ class ElasticCardView @JvmOverloads constructor(
 
     @JvmSynthetic
     fun setOnClickListener(block: () -> Unit) = apply {
-      val onClickListener = OnClickListener { block() }
-      this.elasticCardView.setOnClickListener(onClickListener)
+      setOnClickListener(OnClickListener { block() })
     }
 
     fun setOnClickListener(value: OnClickListener) = apply {
@@ -119,8 +118,7 @@ class ElasticCardView @JvmOverloads constructor(
 
     @JvmSynthetic
     fun setOnFinishListener(block: () -> Unit) = apply {
-      val onElasticFinishListener = ElasticFinishListener { block() }
-      this.elasticCardView.setOnFinishListener(onElasticFinishListener)
+      setOnFinishListener(ElasticFinishListener { block() })
     }
 
     fun setOnFinishListener(value: ElasticFinishListener) = apply {

diff --git a/elasticviews/src/main/java/com/skydoves/elasticviews/ElasticCheckButton.kt b/elasticviews/src/main/java/com/skydoves/elasticviews/ElasticCheckButton.kt
@@ -44,6 +44,7 @@ class ElasticCheckButton @JvmOverloads constructor(
   var checkedAlpha = 0.5f
   var scale = 0.9f
   var duration = 500
+
   @Px
   var cornerRadius = 0f
   var isChecked = false
@@ -159,8 +160,7 @@ class ElasticCheckButton @JvmOverloads constructor(
 
     @JvmSynthetic
     fun setOnClickListener(block: () -> Unit) = apply {
-      val onClickListener = OnClickListener { block() }
-      this.elasticCheckButton.setOnClickListener(onClickListener)
+      setOnClickListener(OnClickListener { block() })
     }
 
     fun setOnClickListener(value: OnClickListener) = apply {
@@ -169,8 +169,7 @@ class ElasticCheckButton @JvmOverloads constructor(
 
     @JvmSynthetic
     fun setOnFinishListener(block: () -> Unit) = apply {
-      val onElasticFinishListener = ElasticFinishListener { block() }
-      this.elasticCheckButton.setOnFinishListener(onElasticFinishListener)
+      setOnFinishListener(ElasticFinishListener { block() })
     }
 
     fun setOnFinishListener(value: ElasticFinishListener) = apply {

diff --git a/elasticviews/src/main/java/com/skydoves/elasticviews/ElasticFloatingActionButton.kt b/elasticviews/src/main/java/com/skydoves/elasticviews/ElasticFloatingActionButton.kt
@@ -102,8 +102,7 @@ class ElasticFloatingActionButton @JvmOverloads constructor(
 
     @JvmSynthetic
     fun setOnClickListener(block: () -> Unit) = apply {
-      val onClickListener = OnClickListener { block() }
-      this.elasticFloatingButton.setOnClickListener(onClickListener)
+      setOnClickListener(OnClickListener { block() })
     }
 
     fun setOnClickListener(value: OnClickListener) = apply {
@@ -112,8 +111,7 @@ class ElasticFloatingActionButton @JvmOverloads constructor(
 
     @JvmSynthetic
     fun setOnFinishListener(block: () -> Unit) = apply {
-      val onElasticFinishListener = ElasticFinishListener { block() }
-      this.elasticFloatingButton.setOnFinishListener(onElasticFinishListener)
+      setOnFinishListener(ElasticFinishListener { block() })
     }
 
     fun setOnFinishListener(value: ElasticFinishListener) = apply {

diff --git a/elasticviews/src/main/java/com/skydoves/elasticviews/ElasticImageView.kt b/elasticviews/src/main/java/com/skydoves/elasticviews/ElasticImageView.kt
@@ -108,8 +108,7 @@ class ElasticImageView @JvmOverloads constructor(
 
     @JvmSynthetic
     fun setOnClickListener(block: () -> Unit) = apply {
-      val onClickListener = OnClickListener { block() }
-      this.elasticImageView.setOnClickListener(onClickListener)
+      setOnClickListener(OnClickListener { block() })
     }
 
     fun setOnClickListener(value: OnClickListener) = apply {
@@ -118,8 +117,7 @@ class ElasticImageView @JvmOverloads constructor(
 
     @JvmSynthetic
     fun setOnFinishListener(block: () -> Unit) = apply {
-      val onElasticFinishListener = ElasticFinishListener { block() }
-      this.elasticImageView.setOnFinishListener(onElasticFinishListener)
+      setOnFinishListener(ElasticFinishListener { block() })
     }
 
     fun setOnFinishListener(value: ElasticFinishListener) = apply {

diff --git a/elasticviews/src/main/java/com/skydoves/elasticviews/ElasticLayout.kt b/elasticviews/src/main/java/com/skydoves/elasticviews/ElasticLayout.kt
@@ -131,8 +131,7 @@ class ElasticLayout @JvmOverloads constructor(
 
     @JvmSynthetic
     fun setOnClickListener(block: () -> Unit) = apply {
-      val onClickListener = OnClickListener { block() }
-      this.elasticLayout.setOnClickListener(onClickListener)
+      setOnClickListener(OnClickListener { block() })
     }
 
     fun setOnClickListener(value: OnClickListener) = apply {
@@ -141,8 +140,7 @@ class ElasticLayout @JvmOverloads constructor(
 
     @JvmSynthetic
     fun setOnFinishListener(block: () -> Unit) = apply {
-      val onElasticFinishListener = ElasticFinishListener { block() }
-      this.elasticLayout.setOnFinishListener(onElasticFinishListener)
+      setOnFinishListener(ElasticFinishListener { block() })
     }
 
     fun setOnFinishListener(value: ElasticFinishListener) = apply {