🎨 防止焦点导致崩溃，部分列表循环

yaoxieyoulei · yaoxieyoulei · commit e258dcc717bf · 2024-11-30T20:45:25.000+08:00
diff --git a/tv/src/main/java/top/yogiczy/mytv/tv/ui/material/Popup.kt b/tv/src/main/java/top/yogiczy/mytv/tv/ui/material/Popup.kt
@@ -19,6 +19,7 @@ import androidx.compose.ui.input.pointer.pointerInput
 import androidx.tv.material3.MaterialTheme
 import top.yogiczy.mytv.tv.ui.utils.captureBackKey
 import top.yogiczy.mytv.tv.ui.utils.ifElse
+import top.yogiczy.mytv.tv.ui.utils.saveRequestFocus
 import java.util.UUID
 
 class PopupManager {
@@ -57,7 +58,7 @@ fun Modifier.popupable() = composed {
     val focusRequester = remember { FocusRequester() }
 
     DisposableEffect(Unit) {
-        focusRequester.requestFocus()
+        focusRequester.saveRequestFocus()
         popupManager.push(focusRequester)
         onDispose { popupManager.pop() }
     }
diff --git a/tv/src/main/java/top/yogiczy/mytv/tv/ui/screens/channel/components/ChannelItem.kt b/tv/src/main/java/top/yogiczy/mytv/tv/ui/screens/channel/components/ChannelItem.kt
@@ -36,6 +36,7 @@ import top.yogiczy.mytv.core.data.entities.epg.EpgProgrammeRecent
 import top.yogiczy.mytv.tv.ui.theme.MyTVTheme
 import top.yogiczy.mytv.tv.ui.utils.handleKeyEvents
 import top.yogiczy.mytv.tv.ui.utils.ifElse
+import top.yogiczy.mytv.tv.ui.utils.saveRequestFocus
 
 @Composable
 fun ChannelItem(
@@ -57,7 +58,7 @@ fun ChannelItem(
     LaunchedEffect(Unit) {
         if (initialFocused) {
             onInitialFocused()
-            focusRequester.requestFocus()
+            focusRequester.saveRequestFocus()
         }
     }
 
diff --git a/tv/src/main/java/top/yogiczy/mytv/tv/ui/screens/classicchannel/components/ClassicChannelGroupItemList.kt b/tv/src/main/java/top/yogiczy/mytv/tv/ui/screens/classicchannel/components/ClassicChannelGroupItemList.kt
@@ -16,13 +16,13 @@ import androidx.compose.runtime.derivedStateOf
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
+import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.runtime.setValue
 import androidx.compose.runtime.snapshotFlow
 import androidx.compose.ui.ExperimentalComposeUiApi
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.focus.FocusRequester
 import androidx.compose.ui.focus.focusRequester
-import androidx.compose.ui.focus.focusRestorer
 import androidx.compose.ui.focus.onFocusChanged
 import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.tooling.preview.Preview
@@ -32,6 +32,7 @@ import androidx.tv.material3.ListItemDefaults
 import androidx.tv.material3.MaterialTheme
 import androidx.tv.material3.Text
 import kotlinx.coroutines.flow.distinctUntilChanged
+import kotlinx.coroutines.launch
 import top.yogiczy.mytv.core.data.entities.channel.ChannelGroup
 import top.yogiczy.mytv.core.data.entities.channel.ChannelGroupList
 import top.yogiczy.mytv.tv.ui.material.rememberDebounceState
@@ -40,6 +41,8 @@ import top.yogiczy.mytv.tv.ui.theme.MyTVTheme
 import top.yogiczy.mytv.tv.ui.utils.focusOnLaunchedSaveable
 import top.yogiczy.mytv.tv.ui.utils.handleKeyEvents
 import top.yogiczy.mytv.tv.ui.utils.ifElse
+import top.yogiczy.mytv.tv.ui.utils.saveFocusRestorer
+import top.yogiczy.mytv.tv.ui.utils.saveRequestFocus
 import kotlin.math.max
 
 @OptIn(ExperimentalComposeUiApi::class)
@@ -68,14 +71,31 @@ fun ClassicChannelGroupItemList(
         onChannelGroupFocused(focusedChannelGroup)
     }
 
+    val coroutineScope = rememberCoroutineScope()
+    val firstFocusRequester = remember { FocusRequester() }
+    val lastFocusRequester = remember { FocusRequester() }
+    fun scrollToFirst() {
+        coroutineScope.launch {
+            listState.scrollToItem(0)
+            firstFocusRequester.saveRequestFocus()
+        }
+    }
+
+    fun scrollToLast() {
+        coroutineScope.launch {
+            listState.scrollToItem(channelGroupList.lastIndex)
+            lastFocusRequester.saveRequestFocus()
+        }
+    }
+
     LazyColumn(
         modifier = modifier
             .width(140.dp)
             .fillMaxHeight()
             .background(MaterialTheme.colorScheme.surface.copy(0.9f))
             .ifElse(
                 LocalSettings.current.uiFocusOptimize,
-                Modifier.focusRestorer {
+                Modifier.saveFocusRestorer {
                     itemFocusRequesterList[channelGroupList.indexOf(focusedChannelGroup)]
                 },
             ),
@@ -89,7 +109,19 @@ fun ClassicChannelGroupItemList(
             ClassicChannelGroupItem(
                 modifier = Modifier
                     .ifElse(channelGroup == initialChannelGroup, Modifier.focusOnLaunchedSaveable())
-                    .focusRequester(itemFocusRequesterList[index]),
+                    .focusRequester(itemFocusRequesterList[index])
+                    .ifElse(
+                        index == 0,
+                        Modifier
+                            .focusRequester(firstFocusRequester)
+                            .handleKeyEvents(onUp = { scrollToLast() })
+                    )
+                    .ifElse(
+                        index == channelGroupList.lastIndex,
+                        Modifier
+                            .focusRequester(lastFocusRequester)
+                            .handleKeyEvents(onDown = { scrollToFirst() })
+                    ),
                 channelGroupProvider = { channelGroup },
                 isSelectedProvider = { isSelected },
                 onFocused = {
diff --git a/tv/src/main/java/top/yogiczy/mytv/tv/ui/screens/classicchannel/components/ClassicChannelItemList.kt b/tv/src/main/java/top/yogiczy/mytv/tv/ui/screens/classicchannel/components/ClassicChannelItemList.kt
@@ -19,6 +19,7 @@ import androidx.compose.runtime.derivedStateOf
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
+import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.runtime.saveable.rememberSaveable
 import androidx.compose.runtime.setValue
 import androidx.compose.runtime.snapshotFlow
@@ -29,7 +30,6 @@ import androidx.compose.ui.draw.clip
 import androidx.compose.ui.focus.FocusDirection
 import androidx.compose.ui.focus.FocusRequester
 import androidx.compose.ui.focus.focusRequester
-import androidx.compose.ui.focus.focusRestorer
 import androidx.compose.ui.focus.onFocusChanged
 import androidx.compose.ui.platform.LocalFocusManager
 import androidx.compose.ui.text.style.TextOverflow
@@ -40,6 +40,7 @@ import androidx.tv.material3.ListItemDefaults
 import androidx.tv.material3.MaterialTheme
 import androidx.tv.material3.Text
 import kotlinx.coroutines.flow.distinctUntilChanged
+import kotlinx.coroutines.launch
 import top.yogiczy.mytv.core.data.entities.channel.Channel
 import top.yogiczy.mytv.core.data.entities.channel.ChannelGroup
 import top.yogiczy.mytv.core.data.entities.channel.ChannelList
@@ -53,6 +54,8 @@ import top.yogiczy.mytv.tv.ui.screens.settings.LocalSettings
 import top.yogiczy.mytv.tv.ui.theme.MyTVTheme
 import top.yogiczy.mytv.tv.ui.utils.handleKeyEvents
 import top.yogiczy.mytv.tv.ui.utils.ifElse
+import top.yogiczy.mytv.tv.ui.utils.saveFocusRestorer
+import top.yogiczy.mytv.tv.ui.utils.saveRequestFocus
 import kotlin.math.max
 
 @OptIn(ExperimentalComposeUiApi::class)
@@ -100,14 +103,33 @@ fun ClassicChannelItemList(
             .collect { _ -> onUserAction() }
     }
 
+    val coroutineScope = rememberCoroutineScope()
+    val firstFocusRequester = remember { FocusRequester() }
+    val lastFocusRequester = remember { FocusRequester() }
+    fun scrollToFirst() {
+        coroutineScope.launch {
+            listState.scrollToItem(0)
+            firstFocusRequester.saveRequestFocus()
+        }
+    }
+
+    fun scrollToLast() {
+        coroutineScope.launch {
+            listState.scrollToItem(channelList.lastIndex)
+            lastFocusRequester.saveRequestFocus()
+        }
+    }
+
     LazyColumn(
         modifier = modifier
             .fillMaxHeight()
             .width(if (showChannelLogoProvider()) 280.dp else 220.dp)
             .background(MaterialTheme.colorScheme.surface.copy(0.8f))
             .ifElse(
                 LocalSettings.current.uiFocusOptimize,
-                Modifier.focusRestorer { itemFocusRequesterList[channelList.indexOf(focusedChannel)] },
+                Modifier.saveFocusRestorer {
+                    itemFocusRequesterList[channelList.indexOf(focusedChannel)]
+                },
             ),
         state = listState,
         contentPadding = PaddingValues(8.dp),
@@ -120,6 +142,19 @@ fun ClassicChannelItemList(
             }
 
             ClassicChannelItem(
+                modifier = Modifier
+                    .ifElse(
+                        index == 0,
+                        Modifier
+                            .focusRequester(firstFocusRequester)
+                            .handleKeyEvents(onUp = { scrollToLast() })
+                    )
+                    .ifElse(
+                        index == channelList.lastIndex,
+                        Modifier
+                            .focusRequester(lastFocusRequester)
+                            .handleKeyEvents(onDown = { scrollToFirst() })
+                    ),
                 channelProvider = { channel },
                 onChannelSelected = { onChannelSelected(channel) },
                 onChannelFavoriteToggle = {
@@ -177,7 +212,7 @@ private fun ClassicChannelItem(
     LaunchedEffect(Unit) {
         if (initialFocusedProvider()) {
             onInitialFocused()
-            focusRequester.requestFocus()
+            focusRequester.saveRequestFocus()
         }
     }
 
diff --git a/tv/src/main/java/top/yogiczy/mytv/tv/ui/screens/epg/components/EpgDayItemList.kt b/tv/src/main/java/top/yogiczy/mytv/tv/ui/screens/epg/components/EpgDayItemList.kt
@@ -13,7 +13,6 @@ import androidx.compose.ui.ExperimentalComposeUiApi
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.focus.FocusRequester
 import androidx.compose.ui.focus.focusRequester
-import androidx.compose.ui.focus.focusRestorer
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import kotlinx.collections.immutable.ImmutableList
@@ -22,6 +21,7 @@ import kotlinx.coroutines.flow.distinctUntilChanged
 import top.yogiczy.mytv.tv.ui.screens.settings.LocalSettings
 import top.yogiczy.mytv.tv.ui.theme.MyTVTheme
 import top.yogiczy.mytv.tv.ui.utils.ifElse
+import top.yogiczy.mytv.tv.ui.utils.saveFocusRestorer
 import kotlin.math.max
 
 @OptIn(ExperimentalComposeUiApi::class)
@@ -48,7 +48,7 @@ fun EpgDayItemList(
     LazyColumn(
         modifier = modifier.ifElse(
             LocalSettings.current.uiFocusOptimize,
-            Modifier.focusRestorer { itemFocusRequesterList[dayList.indexOf(currentDay)] },
+            Modifier.saveFocusRestorer { itemFocusRequesterList[dayList.indexOf(currentDay)] },
         ),
         state = listState,
         contentPadding = PaddingValues(vertical = 8.dp),
diff --git a/tv/src/main/java/top/yogiczy/mytv/tv/ui/screens/settings/components/SettingsCategoryList.kt b/tv/src/main/java/top/yogiczy/mytv/tv/ui/screens/settings/components/SettingsCategoryList.kt
@@ -16,7 +16,6 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.focus.FocusDirection
 import androidx.compose.ui.focus.FocusRequester
 import androidx.compose.ui.focus.focusRequester
-import androidx.compose.ui.focus.focusRestorer
 import androidx.compose.ui.focus.onFocusChanged
 import androidx.compose.ui.graphics.vector.ImageVector
 import androidx.compose.ui.platform.LocalFocusManager
@@ -34,6 +33,7 @@ import top.yogiczy.mytv.tv.ui.theme.MyTVTheme
 import top.yogiczy.mytv.tv.ui.utils.focusOnLaunchedSaveable
 import top.yogiczy.mytv.tv.ui.utils.handleKeyEvents
 import top.yogiczy.mytv.tv.ui.utils.ifElse
+import top.yogiczy.mytv.tv.ui.utils.saveFocusRestorer
 
 @OptIn(ExperimentalComposeUiApi::class)
 @Composable
@@ -49,7 +49,7 @@ fun SettingsCategoryList(
         verticalArrangement = Arrangement.spacedBy(10.dp),
         modifier = modifier.ifElse(
             LocalSettings.current.uiFocusOptimize,
-            Modifier.focusRestorer(),
+            Modifier.saveFocusRestorer(),
         ),
     ) {
         itemsIndexed(SettingsCategories.entries) { index, category ->
diff --git a/tv/src/main/java/top/yogiczy/mytv/tv/ui/screens/settings/components/SettingsContentList.kt b/tv/src/main/java/top/yogiczy/mytv/tv/ui/screens/settings/components/SettingsContentList.kt
@@ -6,16 +6,14 @@ import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.lazy.LazyListScope
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.remember
-import androidx.compose.ui.ExperimentalComposeUiApi
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.focus.FocusRequester
-import androidx.compose.ui.focus.focusRestorer
 import androidx.compose.ui.unit.dp
 import top.yogiczy.mytv.tv.ui.rememberChildPadding
 import top.yogiczy.mytv.tv.ui.screens.settings.LocalSettings
 import top.yogiczy.mytv.tv.ui.utils.ifElse
+import top.yogiczy.mytv.tv.ui.utils.saveFocusRestorer
 
-@OptIn(ExperimentalComposeUiApi::class)
 @Composable
 fun SettingsContentList(
     modifier: Modifier = Modifier,
@@ -27,7 +25,7 @@ fun SettingsContentList(
     LazyColumn(
         modifier = modifier.ifElse(
             LocalSettings.current.uiFocusOptimize,
-            Modifier.focusRestorer { firstItemFocusRequester },
+            Modifier.saveFocusRestorer { firstItemFocusRequester },
         ),
         verticalArrangement = Arrangement.spacedBy(10.dp),
         contentPadding = PaddingValues(top = 4.dp, bottom = childPadding.bottom),
diff --git a/tv/src/main/java/top/yogiczy/mytv/tv/ui/utils/ModifierUtils.kt b/tv/src/main/java/top/yogiczy/mytv/tv/ui/utils/ModifierUtils.kt

Original file line number	Diff line number	Diff line change
`@@ -36,6 +36,7 @@ import top.yogiczy.mytv.core.data.entities.epg.EpgProgrammeRecent`
`36`	`36`	`import top.yogiczy.mytv.tv.ui.theme.MyTVTheme`
`37`	`37`	`import top.yogiczy.mytv.tv.ui.utils.handleKeyEvents`
`38`	`38`	`import top.yogiczy.mytv.tv.ui.utils.ifElse`
	`39`	`+import top.yogiczy.mytv.tv.ui.utils.saveRequestFocus`
`39`	`40`
`40`	`41`	`@Composable`
`41`	`42`	`fun ChannelItem(`
`@@ -57,7 +58,7 @@ fun ChannelItem(`
`57`	`58`	`LaunchedEffect(Unit) {`
`58`	`59`	`if (initialFocused) {`
`59`	`60`	`onInitialFocused()`
`60`		`- focusRequester.requestFocus()`
	`61`	`+ focusRequester.saveRequestFocus()`
`61`	`62`	`}`
`62`	`63`	`}`
`63`	`64`