修复异形屏设备菜单面板的错误内边距

aaa1115910 · aaa1115910 · commit 4d126f2e3a3d · 2025-09-17T19:40:16.000+08:00
fixed #256
diff --git a/player/mobile/src/main/kotlin/dev/aaa1115910/bv/player/mobile/controller/BvPlayerController.kt b/player/mobile/src/main/kotlin/dev/aaa1115910/bv/player/mobile/controller/BvPlayerController.kt
@@ -153,7 +153,9 @@ fun BvPlayerController(
                 onCloseMenu = { isMenuOpen = false }
             ) {
                 Box(
-                    modifier = Modifier.clip(RoundedCornerShape(0.dp))
+                    modifier = Modifier
+                        .fillMaxSize()
+                        .clip(RoundedCornerShape(0.dp))
                 ) {
                     content()
                 }
diff --git a/player/mobile/src/main/kotlin/dev/aaa1115910/bv/player/mobile/controller/menu/DanmakuMenu.kt b/player/mobile/src/main/kotlin/dev/aaa1115910/bv/player/mobile/controller/menu/DanmakuMenu.kt
@@ -4,6 +4,7 @@ import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.WindowInsets
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
@@ -54,13 +55,14 @@ fun DanmakuMenu(
                             contentDescription = null
                         )
                     }
-                }
+                },
+                windowInsets = WindowInsets(0, 0, 0, 0)
             )
         }
     ) { innerPadding ->
         LazyColumn(
             modifier = Modifier
-                .padding(innerPadding)
+                .padding(top = innerPadding.calculateTopPadding())
                 .fillMaxSize(),
             contentPadding = PaddingValues(vertical = 12.dp, horizontal = 24.dp),
             horizontalAlignment = Alignment.CenterHorizontally
@@ -155,7 +157,7 @@ private fun EnabledDanmakuTypeButton(
 
     FilterChip(
         modifier = modifier,
-        label = { Text(text = danmakuType.getDisplayName(context).replace("弹幕","")) },
+        label = { Text(text = danmakuType.getDisplayName(context).replace("弹幕", "")) },
         selected = selected,
         onClick = { onEnabledStateChange(!selected) }
     )
diff --git a/player/mobile/src/main/kotlin/dev/aaa1115910/bv/player/mobile/controller/menu/DashMenu.kt b/player/mobile/src/main/kotlin/dev/aaa1115910/bv/player/mobile/controller/menu/DashMenu.kt
@@ -1,10 +1,12 @@
 package dev.aaa1115910.bv.player.mobile.controller.menu
 
+import android.annotation.SuppressLint
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.ExperimentalLayoutApi
 import androidx.compose.foundation.layout.FlowRow
 import androidx.compose.foundation.layout.PaddingValues
+import androidx.compose.foundation.layout.WindowInsets
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.lazy.LazyColumn
@@ -38,6 +40,7 @@ import dev.aaa1115910.bv.player.entity.VideoCodec
 import dev.aaa1115910.bv.player.entity.VideoPlayerConfigData
 import dev.aaa1115910.bv.player.mobile.MaterialDarkTheme
 
+@SuppressLint("UnusedMaterial3ScaffoldPaddingParameter")
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable
 fun DashMenu(
@@ -59,13 +62,14 @@ fun DashMenu(
                             contentDescription = null
                         )
                     }
-                }
+                },
+                windowInsets = WindowInsets(0, 0, 0, 0)
             )
         }
     ) { innerPadding ->
         LazyColumn(
             modifier = Modifier
-                .padding(innerPadding)
+                .padding(top = innerPadding.calculateTopPadding())
                 .padding(horizontal = 18.dp),
             contentPadding = PaddingValues(bottom = 32.dp)
         ) {
diff --git a/player/mobile/src/main/kotlin/dev/aaa1115910/bv/player/mobile/controller/menu/MoreMenu.kt b/player/mobile/src/main/kotlin/dev/aaa1115910/bv/player/mobile/controller/menu/MoreMenu.kt
@@ -1,5 +1,6 @@
 package dev.aaa1115910.bv.player.mobile.controller.menu
 
+import androidx.compose.foundation.layout.WindowInsets
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.material.icons.Icons
@@ -31,13 +32,14 @@ fun MoreMenu(
                             contentDescription = null
                         )
                     }
-                }
+                },
+                windowInsets = WindowInsets(0, 0, 0, 0)
             )
         }
     ) { innerPadding ->
         LazyColumn(
             modifier = Modifier
-                .padding(innerPadding)
+                .padding(top = innerPadding.calculateTopPadding())
         ) {
 
         }
diff --git a/player/mobile/src/main/kotlin/dev/aaa1115910/bv/player/mobile/controller/menu/SpeedMenu.kt b/player/mobile/src/main/kotlin/dev/aaa1115910/bv/player/mobile/controller/menu/SpeedMenu.kt
@@ -3,6 +3,7 @@ package dev.aaa1115910.bv.player.mobile.controller.menu
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.WindowInsets
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
@@ -49,13 +50,14 @@ fun SpeedMenu(
                             contentDescription = null
                         )
                     }
-                }
+                },
+                windowInsets = WindowInsets(0, 0, 0, 0)
             )
         }
     ) { innerPadding ->
         LazyColumn(
             modifier = Modifier
-                .padding(innerPadding)
+                .padding(top = innerPadding.calculateTopPadding())
                 .fillMaxSize(),
             contentPadding = PaddingValues(vertical = 12.dp),
             verticalArrangement = Arrangement.Center,
diff --git a/player/mobile/src/main/kotlin/dev/aaa1115910/bv/player/mobile/controller/menu/VideoListMenu.kt b/player/mobile/src/main/kotlin/dev/aaa1115910/bv/player/mobile/controller/menu/VideoListMenu.kt
@@ -2,6 +2,7 @@ package dev.aaa1115910.bv.player.mobile.controller.menu
 
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.PaddingValues
+import androidx.compose.foundation.layout.WindowInsets
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
@@ -79,13 +80,14 @@ fun VideoListMenu(
                             contentDescription = null
                         )
                     }
-                }
+                },
+                windowInsets = WindowInsets(0, 0, 0, 0)
             )
         }
     ) { innerPadding ->
         LazyColumn(
             modifier = Modifier
-                .padding(innerPadding)
+                .padding(top = innerPadding.calculateTopPadding())
                 .fillMaxSize(),
             contentPadding = PaddingValues(vertical = 12.dp, horizontal = 12.dp),
             horizontalAlignment = Alignment.CenterHorizontally

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,6 @@`
`1`	`1`	`package dev.aaa1115910.bv.player.mobile.controller.menu`
`2`	`2`
	`3`	`+import androidx.compose.foundation.layout.WindowInsets`
`3`	`4`	`import androidx.compose.foundation.layout.padding`
`4`	`5`	`import androidx.compose.foundation.lazy.LazyColumn`
`5`	`6`	`import androidx.compose.material.icons.Icons`
`@@ -31,13 +32,14 @@ fun MoreMenu(`
`31`	`32`	`contentDescription = null`
`32`	`33`	`)`
`33`	`34`	`}`
`34`		`- }`
	`35`	`+ },`
	`36`	`+ windowInsets = WindowInsets(0, 0, 0, 0)`
`35`	`37`	`)`
`36`	`38`	`}`
`37`	`39`	`) { innerPadding ->`
`38`	`40`	`LazyColumn(`
`39`	`41`	`modifier = Modifier`
`40`		`- .padding(innerPadding)`
	`42`	`+ .padding(top = innerPadding.calculateTopPadding())`
`41`	`43`	`) {`
`42`	`44`
`43`	`45`	`}`
Original file line number	Diff line number	Diff line change
`@@ -3,6 +3,7 @@ package dev.aaa1115910.bv.player.mobile.controller.menu`
`3`	`3`	`import androidx.compose.foundation.layout.Arrangement`
`4`	`4`	`import androidx.compose.foundation.layout.PaddingValues`
`5`	`5`	`import androidx.compose.foundation.layout.Row`
	`6`	`+import androidx.compose.foundation.layout.WindowInsets`
`6`	`7`	`import androidx.compose.foundation.layout.fillMaxSize`
`7`	`8`	`import androidx.compose.foundation.layout.padding`
`8`	`9`	`import androidx.compose.foundation.layout.size`
`@@ -49,13 +50,14 @@ fun SpeedMenu(`
`49`	`50`	`contentDescription = null`
`50`	`51`	`)`
`51`	`52`	`}`
`52`		`- }`
	`53`	`+ },`
	`54`	`+ windowInsets = WindowInsets(0, 0, 0, 0)`
`53`	`55`	`)`
`54`	`56`	`}`
`55`	`57`	`) { innerPadding ->`
`56`	`58`	`LazyColumn(`
`57`	`59`	`modifier = Modifier`
`58`		`- .padding(innerPadding)`
	`60`	`+ .padding(top = innerPadding.calculateTopPadding())`
`59`	`61`	`.fillMaxSize(),`
`60`	`62`	`contentPadding = PaddingValues(vertical = 12.dp),`
`61`	`63`	`verticalArrangement = Arrangement.Center,`
Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,7 @@ package dev.aaa1115910.bv.player.mobile.controller.menu`
`2`	`2`
`3`	`3`	`import androidx.compose.foundation.clickable`
`4`	`4`	`import androidx.compose.foundation.layout.PaddingValues`
	`5`	`+import androidx.compose.foundation.layout.WindowInsets`
`5`	`6`	`import androidx.compose.foundation.layout.fillMaxSize`
`6`	`7`	`import androidx.compose.foundation.layout.fillMaxWidth`
`7`	`8`	`import androidx.compose.foundation.layout.padding`
`@@ -79,13 +80,14 @@ fun VideoListMenu(`
`79`	`80`	`contentDescription = null`
`80`	`81`	`)`
`81`	`82`	`}`
`82`		`- }`
	`83`	`+ },`
	`84`	`+ windowInsets = WindowInsets(0, 0, 0, 0)`
`83`	`85`	`)`
`84`	`86`	`}`
`85`	`87`	`) { innerPadding ->`
`86`	`88`	`LazyColumn(`
`87`	`89`	`modifier = Modifier`
`88`		`- .padding(innerPadding)`
	`90`	`+ .padding(top = innerPadding.calculateTopPadding())`
`89`	`91`	`.fillMaxSize(),`
`90`	`92`	`contentPadding = PaddingValues(vertical = 12.dp, horizontal = 12.dp),`
`91`	`93`	`horizontalAlignment = Alignment.CenterHorizontally`