add buttons row selected item animation

Author: Razeeman

app/src/androidTest/java/com/example/util/simpletimetracker/StatisticsDetailTest.kt

@@ -714,8 +714,10 @@ class StatisticsDetailTest : BaseUiTest() {
             timeEnded = calendar.timeInMillis + TimeUnit.HOURS.toMillis(2),
             tagNames = listOf(tag2),
         )
-        calendar = Calendar.getInstance()
-            .apply { add(Calendar.MONTH, -1) }
+        calendar = Calendar.getInstance().apply {
+            add(Calendar.MONTH, -1)
+            set(Calendar.DAY_OF_MONTH, 15)
+        }
         testUtils.addRecord(
             typeName = name,
             timeStarted = calendar.timeInMillis,
@@ -729,7 +731,7 @@ class StatisticsDetailTest : BaseUiTest() {
         checkPreview(color, icon, name)
 
         // Switch range
-        clickOnCurrentDate()
+        clickOnCurrentSelectedDate()
         clickOnViewWithText(coreR.string.range_month)
 
         // Daily calendar

buildSrc/src/main/kotlin/com/example/util/simpletimetracker/Base.kt

@@ -5,7 +5,7 @@ object Base {
     const val namespace = "com.example.util.simpletimetracker"
 
     // Raise by 2 to account for wear version code.
-    const val versionCode = 113
+    const val versionCode = 115
     const val versionName = "1.51"
     const val minSDK = 21
     const val currentSDK = 35

core/src/main/java/com/example/util/simpletimetracker/core/delegates/iconSelection/viewDelegate/IconSelectionViewDelegate.kt

@@ -185,7 +185,7 @@ object IconSelectionViewDelegate {
         data: List<ViewHolderType>,
         layout: IconSelectionLayoutBinding,
     ) = with(layout) {
-        btnIconSelectionSwitch.adapter.replace(data)
+        btnIconSelectionSwitch.replace(data)
     }
 
     private fun updateIconsState(

features/feature_base_adapter/src/main/java/com/example/util/simpletimetracker/feature_base_adapter/buttonsRow/ButtonsRowAdapterDelegate.kt

@@ -19,11 +19,7 @@ fun createButtonsRowAdapterDelegate(
 
         setMargins(top = item.marginTopDp)
         // Replace without animation on reuse for different buttons.
-        if (tag != item.block) {
-            adapter.replaceFast(item.data)
-        } else {
-            adapter.replace(item.data)
-        }
+        replace(item.data, isFast = tag != item.block)
         listener = { onClick(item.block, it) }
         tag = item.block
     }

features/feature_base_adapter/src/main/java/com/example/util/simpletimetracker/feature_base_adapter/buttonsRow/view/ButtonsRowView.kt

@@ -1,12 +1,13 @@
 package com.example.util.simpletimetracker.feature_base_adapter.buttonsRow.view
 
+import android.animation.ValueAnimator
 import android.content.Context
 import android.util.AttributeSet
 import android.widget.FrameLayout
-import androidx.core.content.ContextCompat
+import androidx.core.view.updateLayoutParams
 import com.example.util.simpletimetracker.feature_base_adapter.BaseRecyclerAdapter
+import com.example.util.simpletimetracker.feature_base_adapter.ViewHolderType
 import com.example.util.simpletimetracker.feature_base_adapter.databinding.ButtonsRowViewLayoutBinding
-import com.example.util.simpletimetracker.feature_views.R
 import com.example.util.simpletimetracker.feature_views.extension.layoutInflater
 import com.google.android.flexbox.FlexDirection
 import com.google.android.flexbox.FlexWrap
@@ -25,30 +26,45 @@ class ButtonsRowView @JvmOverloads constructor(
 
     var listener: ((ButtonsRowViewData) -> Unit)? = null
 
-    val adapter: BaseRecyclerAdapter by lazy {
+    private val adapter: BaseRecyclerAdapter by lazy {
         BaseRecyclerAdapter(
-            createButtonsRowViewInternalAdapterDelegate(selectedColor, ::onItemClick),
+            createButtonsRowViewInternalAdapterDelegate(::onItemClick),
         )
     }
 
     private val binding = ButtonsRowViewLayoutBinding.inflate(layoutInflater, this)
 
-    private val selectedColor by lazy {
-        var defaultColor = ContextCompat.getColor(context, R.color.colorPrimary)
-        runCatching {
-            context.theme?.obtainStyledAttributes(intArrayOf(R.attr.appActiveColor))?.run {
-                defaultColor = getColor(0, defaultColor)
-                recycle()
-            }
-        }
-        defaultColor
+    private var selectedPositionAnimator: ValueAnimator? = null
+    private var updateSelectedPositionOnLayout: Boolean = false
+    private val selectedPositionAnimationDuration: Float by lazy {
+        resources.getInteger(android.R.integer.config_shortAnimTime) * 0.85f
     }
 
     init {
         initRecycler()
         initEditMode()
     }
 
+    override fun onLayout(changed: Boolean, left: Int, top: Int, right: Int, bottom: Int) {
+        super.onLayout(changed, left, top, right, bottom)
+        // In case container is not visible on adapter items replace.
+        if (updateSelectedPositionOnLayout) {
+            updateSelectedPositionOnLayout = false
+            updateSelectedItem(adapter.currentList, isFast = false)
+        }
+    }
+
+    fun replace(items: List<ViewHolderType>, isFast: Boolean = false) {
+        if (isFast) {
+            adapter.replaceFast(items)
+        } else {
+            adapter.replace(items)
+        }
+        binding.rvButtonsRowView.post {
+            updateSelectedItem(items, isFast)
+        }
+    }
+
     private fun onItemClick(buttonsRowViewData: ButtonsRowViewData) {
         listener?.invoke(buttonsRowViewData)
     }
@@ -64,6 +80,45 @@ class ButtonsRowView @JvmOverloads constructor(
         }
     }
 
+    private fun updateSelectedItem(
+        currentList: List<ViewHolderType>,
+        isFast: Boolean,
+    ) = with(binding) {
+        val containerWidth = rvButtonsRowView.width
+        if (containerWidth == 0) {
+            updateSelectedPositionOnLayout = true
+            return@with
+        }
+        val selectedItemIndex = currentList
+            .indexOfFirst { it is ButtonsRowViewData && it.isSelected }
+            .takeUnless { it == -1 }
+            ?: return@with
+        val itemsCount = currentList.size.takeIf { it > 0 }
+            ?: return@with
+        val itemWidth = containerWidth / itemsCount
+
+        if (btnButtonsRowSelected.width != itemWidth) {
+            btnButtonsRowSelected.updateLayoutParams { width = itemWidth }
+        }
+
+        val currentPosition = btnButtonsRowSelected.translationX
+        val newPosition = itemWidth.toFloat() * selectedItemIndex
+        if (currentPosition != newPosition) {
+            if (isFast) {
+                btnButtonsRowSelected.translationX = newPosition
+            } else {
+                selectedPositionAnimator?.cancel()
+                val animator = ValueAnimator.ofFloat(currentPosition, newPosition)
+                selectedPositionAnimator = animator
+                animator.duration = selectedPositionAnimationDuration.toLong()
+                animator.addUpdateListener { value ->
+                    btnButtonsRowSelected.translationX = value.animatedValue as Float
+                }
+                animator.start()
+            }
+        }
+    }
+
     private fun initEditMode() {
         if (isInEditMode) {
             listOf(

features/feature_base_adapter/src/main/java/com/example/util/simpletimetracker/feature_base_adapter/buttonsRow/view/ButtonsRowViewInternalAdapterDelegate.kt

@@ -1,14 +1,12 @@
 package com.example.util.simpletimetracker.feature_base_adapter.buttonsRow.view
 
-import android.graphics.Color
 import android.util.TypedValue
 import com.example.util.simpletimetracker.feature_base_adapter.createRecyclerBindingAdapterDelegate
 import com.example.util.simpletimetracker.feature_views.extension.setOnClickWith
 import com.example.util.simpletimetracker.feature_base_adapter.databinding.ButtonsRowItemLayoutBinding as Binding
 import com.example.util.simpletimetracker.feature_base_adapter.buttonsRow.view.ButtonsRowViewData as ViewData
 
 internal fun createButtonsRowViewInternalAdapterDelegate(
-    selectedColor: Int,
     onItemClick: ((ViewData) -> Unit),
 ) = createRecyclerBindingAdapterDelegate<ViewData, Binding>(
     Binding::inflate,
@@ -17,11 +15,8 @@ internal fun createButtonsRowViewInternalAdapterDelegate(
     with(binding) {
         item as ViewData
 
-        val color = if (item.isSelected) selectedColor else Color.TRANSPARENT
-
         btnButtonsRowView.tag = if (item.isSelected) ViewData.SELECTED_BUTTON_TEST_TAG else ""
         btnButtonsRowView.text = item.name
-        btnButtonsRowView.setBackgroundColor(color)
         btnButtonsRowView.setTextSize(
             TypedValue.COMPLEX_UNIT_SP,
             item.textSizeSp?.toFloat() ?: 14f,

features/feature_base_adapter/src/main/res/layout/buttons_row_view_layout.xml

@@ -17,6 +17,19 @@
         app:backgroundTint="?appInactiveColor"
         app:cornerRadius="@dimen/button_corner_radius" />
 
+    <com.google.android.material.button.MaterialButton
+        android:id="@+id/btnButtonsRowSelected"
+        style="@style/Widget.MaterialComponents.Button.UnelevatedButton"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/button_height"
+        android:layout_marginStart="8dp"
+        android:layout_marginEnd="8dp"
+        android:clickable="false"
+        android:focusable="false"
+        app:backgroundTint="?appActiveColor"
+        app:cornerRadius="@dimen/button_corner_radius"
+        tools:layout_width="100dp" />
+
     <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/rvButtonsRowView"
         android:layout_width="match_parent"

features/feature_change_activity_filter/src/main/java/com/example/util/simpletimetracker/feature_change_activity_filter/view/ChangeActivityFilterFragment.kt

@@ -135,7 +135,7 @@ class ChangeActivityFilterFragment :
             filterPreview.observeOnce(viewLifecycleOwner, ::updateUi)
             filterPreview.observe(::updatePreview)
             colors.observe(colorsAdapter::replace)
-            filterTypeViewData.observe(buttonsChangeActivityFilterType.adapter::replace)
+            filterTypeViewData.observe(buttonsChangeActivityFilterType::replace)
             viewData.observe(::updateTypes)
             chooserState.observe(::updateChooserState)
             keyboardVisibility.observe { visible ->

features/feature_change_goals/views/src/main/java/com/example/util/simpletimetracker/feature_change_goals/views/GoalsViewDelegate.kt

@@ -161,7 +161,7 @@ object GoalsViewDelegate {
 
             if (goal.subtypeItems.isNotEmpty()) {
                 view.btnChangeRecordTypeGoalSubtype.visible = true
-                view.btnChangeRecordTypeGoalSubtype.adapter.replace(goal.subtypeItems)
+                view.btnChangeRecordTypeGoalSubtype.replace(goal.subtypeItems)
             } else {
                 view.btnChangeRecordTypeGoalSubtype.visible = false
             }

features/feature_dialogs/src/main/java/com/example/util/simpletimetracker/feature_dialogs/cardSize/view/CardSizeDialogFragment.kt

@@ -64,7 +64,7 @@ class CardSizeDialogFragment : BaseBottomSheetFragment<Binding>() {
 
     override fun initViewModel(): Unit = with(viewModel) {
         recordTypes.observe(recordTypesAdapter::replace)
-        buttons.observe(binding.buttonsCardSize.adapter::replace)
+        buttons.observe(binding.buttonsCardSize::replace)
         defaultButton.observe(::updateDefaultButton)
     }