diff --git a/app/src/main/java/com/vanced/manager/adapter/ExpandableAppListAdapter.kt b/app/src/main/java/com/vanced/manager/adapter/ExpandableAppListAdapter.kt index 6fe4d518..4011f765 100644 --- a/app/src/main/java/com/vanced/manager/adapter/ExpandableAppListAdapter.kt +++ b/app/src/main/java/com/vanced/manager/adapter/ExpandableAppListAdapter.kt @@ -55,24 +55,22 @@ class ExpandableAppListAdapter( appDownload.setOnClickListener { viewModel.openInstallDialog(dataModel?.buttonTag?.value, apps[position]) } - appExpandCard.setOnClickListener { + appClickableLayout.setOnClickListener { if (isAnimationRunning) return@setOnClickListener val rootHeight = root.measuredHeight val expandedViewHeight = appExpandedView.height - val expandedTranslation = appExpandCard.height.toFloat() + val expandedTranslation = appClickableLayout.height.toFloat() when (isExpanded.also { isExpanded = !isExpanded }) { true -> { appExpandedView.toggle(0f, 0.8f, -expandedTranslation) root.toggleCard(rootHeight - expandedViewHeight) { addAnimListener() } appExpandArrow.rotateArrow(90f) - appExpandCard.animateCardRadius(0f, 16f) } false -> { root.toggleCard(rootHeight + expandedViewHeight) { addAnimListener() } appExpandedView.toggle(1f, 1f, expandedTranslation) appExpandArrow.rotateArrow(-90f) - appExpandCard.animateCardRadius(16f, 0f) } } } @@ -141,14 +139,6 @@ class ExpandableAppListAdapter( } } - private fun MaterialCardView.animateCardRadius(startPoint: Float, endPoint: Float) { - ValueAnimator.ofFloat(startPoint, endPoint).setDuration(animationDuration).apply { - addUpdateListener { - radius = it.animatedValue as Float - } - }.start() - } - private inline fun MaterialCardView.toggleCard( resultHeight: Int, onAnimation: Animator.() -> Unit diff --git a/app/src/main/res/layout/view_app_expandable.xml b/app/src/main/res/layout/view_app_expandable.xml index c3ed7b6f..d1c4ebe6 100644 --- a/app/src/main/res/layout/view_app_expandable.xml +++ b/app/src/main/res/layout/view_app_expandable.xml @@ -112,18 +112,19 @@ + android:layout_height="wrap_content" + app:layout_constraintTop_toTopOf="parent">