Dot animation behaviour changes, hide subTitle if null or empty, high…

…light every active step with dot animation
mikashboks · Oct 29, 2023 · ccc52b4 · ccc52b4
1 parent 907936f
commit ccc52b4
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 15 deletions.
diff --git a/library/src/main/java/com/transferwise/sequencelayout/SequenceLayout.kt b/library/src/main/java/com/transferwise/sequencelayout/SequenceLayout.kt
@@ -4,6 +4,7 @@ import android.content.Context
 import android.content.res.TypedArray
 import android.graphics.Rect
 import android.util.AttributeSet
+import android.util.Log
 import android.view.Gravity
 import android.view.LayoutInflater
 import android.view.View
@@ -13,6 +14,7 @@ import android.widget.FrameLayout
 import androidx.annotation.ColorInt
 import androidx.annotation.StyleRes
 import androidx.core.view.ViewCompat
+import androidx.core.view.children
 import com.mikashboks.sequencelayout.R
 
 /**
@@ -238,6 +240,20 @@ public class SequenceLayout(context: Context, attrs: AttributeSet?, defStyleAttr
                             }
                         }
                 }
+                .withEndAction {
+
+                    postDelayed({
+                        // Animate Every activated dot
+                        stepsWrapper.children.forEachIndexed { index, view ->
+                            if(view is SequenceStep && view.isActive()){
+                                dotsWrapper.children().getOrNull(index)?.apply {
+                                    this.isEnabled = true
+                                    this.isActivated = true
+                                }
+                            }
+                        }
+                    }, 500)
+                }
                 .start()
         }
     }
@@ -251,14 +267,6 @@ public class SequenceLayout(context: Context, attrs: AttributeSet?, defStyleAttr
 
     override fun addView(child: View, index: Int, params: ViewGroup.LayoutParams) {
         if (child is SequenceStep) {
-            if (child.isActive()) {
-                child.setPadding(
-                    0,
-                    if (stepsWrapper.childCount == 0) 0 else resources.getDimensionPixelSize(R.dimen.sequence_active_step_padding_top), //no paddingTop if first step is active
-                    0,
-                    resources.getDimensionPixelSize(R.dimen.sequence_active_step_padding_bottom)
-                )
-            }
             child.onStepChangedListener = this
             stepsWrapper.addView(child, params)
             return

diff --git a/library/src/main/java/com/transferwise/sequencelayout/SequenceStep.kt b/library/src/main/java/com/transferwise/sequencelayout/SequenceStep.kt
@@ -11,6 +11,7 @@ import androidx.annotation.Dimension
 import androidx.annotation.StringRes
 import androidx.annotation.StyleRes
 import androidx.core.view.doOnPreDraw
+import androidx.core.view.isVisible
 import androidx.core.widget.TextViewCompat
 import com.mikashboks.sequencelayout.R
 import kotlin.math.max
@@ -155,7 +156,7 @@ public class SequenceStep(context: Context?, attrs: AttributeSet?) : TableRow(co
      */
     public fun setSubtitle(subtitle: CharSequence?) {
         this.subtitle.text = subtitle
-        this.subtitle.visibility = View.VISIBLE
+        this.subtitle.isVisible = subtitle.isNullOrEmpty()
     }
 
     /**

diff --git a/library/src/main/res/values/integers.xml b/library/src/main/res/values/integers.xml
@@ -2,5 +2,5 @@
 <resources>
     <integer name="sequence_step_duration">300</integer>
     <integer name="sequence_pulse_duration">1000</integer>
-    <integer name="sequence_pulse_repeat_pause">3000</integer>
+    <integer name="sequence_pulse_repeat_pause">500</integer>
 </resources>
diff --git a/sample/src/main/res/layout/activity_main.xml b/sample/src/main/res/layout/activity_main.xml
@@ -29,17 +29,15 @@
             <com.transferwise.sequencelayout.SequenceStep
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                app:active="true"
                 app:subtitle="This is the subtitle."
+                app:active="true"
+                app:anchor="30 Nov"
                 app:titleTextAppearance="@style/TextAppearance.AppCompat.Title"
                 app:title="Second step"/>
 
             <com.transferwise.sequencelayout.SequenceStep
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:paddingBottom="8dp"
-                android:paddingTop="4dp"
-                app:active="true"
                 app:anchor="Today"
                 app:subtitle="This is the subtitle of this step.\nIt should describe steps (especially the active step) in a detailed way."
                 app:title="Third step"
@@ -48,12 +46,13 @@
             <com.transferwise.sequencelayout.SequenceStep
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                app:active="true"
+                app:anchor="30 Nov"
                 app:title="Fourth step"/>
 
             <com.transferwise.sequencelayout.SequenceStep
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
+                app:active="true"
                 app:anchor="2 Dec"
                 app:title="Fifth step"/>
         </com.transferwise.sequencelayout.SequenceLayout>