优化播放器菜单

- 删除导致动画拖沓的 animateContentSize() - 修复菜单按钮宽度不一致
aaa1115910 · Dec 22, 2024 · d5120bc · d5120bc
1 parent af7c953
commit d5120bc
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 7 deletions.
diff --git a/app/src/main/kotlin/dev/aaa1115910/bv/component/controllers2/MenuController.kt b/app/src/main/kotlin/dev/aaa1115910/bv/component/controllers2/MenuController.kt
@@ -2,7 +2,6 @@ package dev.aaa1115910.bv.component.controllers2
 
 import android.content.Context
 import androidx.compose.animation.AnimatedVisibility
-import androidx.compose.animation.animateContentSize
 import androidx.compose.animation.expandHorizontally
 import androidx.compose.animation.shrinkHorizontally
 import androidx.compose.foundation.layout.Arrangement
@@ -217,8 +216,7 @@ private fun MenuList(
     onFocusStateChange: (MenuFocusState) -> Unit
 ) {
     Box(
-        modifier = modifier
-            .animateContentSize(),
+        modifier = modifier,
         contentAlignment = Alignment.Center
     ) {
         when (selectedNavMenu) {

diff --git a/app/src/main/kotlin/dev/aaa1115910/bv/component/controllers2/playermenu/ClosedCaptionMenu.kt b/app/src/main/kotlin/dev/aaa1115910/bv/component/controllers2/playermenu/ClosedCaptionMenu.kt
@@ -62,7 +62,7 @@ fun ClosedCaptionMenuList(
         verticalAlignment = Alignment.CenterVertically
     ) {
         val menuItemsModifier = Modifier
-            .width(200.dp)
+            .width(216.dp)
             .padding(horizontal = 8.dp)
         AnimatedVisibility(visible = focusState.focusState != MenuFocusState.MenuNav) {
             when (selectedClosedCaptionMenuItem) {

diff --git a/app/src/main/kotlin/dev/aaa1115910/bv/component/controllers2/playermenu/MenuNav.kt b/app/src/main/kotlin/dev/aaa1115910/bv/component/controllers2/playermenu/MenuNav.kt
@@ -1,6 +1,5 @@
 package dev.aaa1115910.bv.component.controllers2.playermenu
 
-import androidx.compose.animation.animateContentSize
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.foundation.lazy.LazyColumn
@@ -26,7 +25,6 @@ fun MenuNavList(
 
     LazyColumn(
         modifier = modifier
-            .animateContentSize()
             .then(focusRestorerModifiers.parentModifier),
         verticalArrangement = Arrangement.spacedBy(8.dp),
         contentPadding = PaddingValues(16.dp)

diff --git a/app/src/main/kotlin/dev/aaa1115910/bv/component/controllers2/playermenu/PictureMenu.kt b/app/src/main/kotlin/dev/aaa1115910/bv/component/controllers2/playermenu/PictureMenu.kt
@@ -72,7 +72,7 @@ fun PictureMenuList(
         verticalAlignment = Alignment.CenterVertically
     ) {
         val menuItemsModifier = Modifier
-            .width(200.dp)
+            .width(216.dp)
             .padding(horizontal = 8.dp)
         AnimatedVisibility(visible = focusState.focusState != MenuFocusState.MenuNav) {
             when (selectedPictureMenuItem) {