Merge pull request #104 from aquagray/master

thagikura · web-flow · commit b8b06b3a63b6 · 2020-01-28T13:36:25.000+09:00
Fixing comments from previous pull requests
diff --git a/ConstraintLayoutExamples/motionlayout/src/main/java/com/google/androidstudio/motionlayoutexample/histogramdemo/HistogramActivity.kt b/ConstraintLayoutExamples/motionlayout/src/main/java/com/google/androidstudio/motionlayoutexample/histogramdemo/HistogramActivity.kt
@@ -138,7 +138,7 @@ class HistogramActivity : AppCompatActivity() {
 
     fun onClickSwitch(view: View) {
         val animationInterruptible = (view as Switch).isChecked
-        animationGuard.setInterruptible(animationInterruptible)
+        animationGuard.interruptible = animationInterruptible
         /**
          * TODO: The current histogram widget does not support interruptible sort to keep it short.
          * This can be a fun exercise to implement yourself.
diff --git a/ConstraintLayoutExamples/motionlayout/src/main/java/com/google/androidstudio/motionlayoutexample/histogramdemo/HistogramAnimationGuard.kt b/ConstraintLayoutExamples/motionlayout/src/main/java/com/google/androidstudio/motionlayoutexample/histogramdemo/HistogramAnimationGuard.kt
@@ -35,7 +35,12 @@ class HistogramAnimationGuard {
         return animating.get()
     }
 
-    private var interruptible: Boolean = false
+    /**
+     * Allows animation to be interruptible or not. When interruptible, a new animation can start
+     * before the previous animation is finished.
+     */
+    var interruptible: Boolean = false
+
     private val animating = AtomicBoolean(false)
 
     val animationListener: MotionLayout.TransitionListener = object : MotionLayout.TransitionListener {
@@ -51,12 +56,4 @@ class HistogramAnimationGuard {
         override fun onTransitionChange(p0: MotionLayout?, p1: Int, p2: Int, p3: Float) { }
     }
 
-    /**
-     * @param interruptible true if animation is interruptible. I.e. Animation does not need to be
-     * finished before the new one starts.
-     * False if animation must complete before new one can start.
-     */
-    fun setInterruptible(interruptible: Boolean) {
-        this.interruptible = interruptible
-    }
 }
