update

lsongdev · Aug 28, 2024 · 21cd030 · 21cd030
1 parent 6c15128
commit 21cd030
Show file tree

Hide file tree

Showing 7 changed files with 324 additions and 552 deletions.
diff --git a/app/src/main/java/me/lsong/mytv/iptv/TVChannel.kt b/app/src/main/java/me/lsong/mytv/iptv/TVChannel.kt
@@ -31,8 +31,6 @@ data class TVSource(
  */
 @Immutable
 data class TVChannel(
-    val no: String = "",
-    val icon: ImageVector? = null,
     /**
      * 直播源名称
      */
@@ -79,6 +77,6 @@ data class TVChannelList(
     val value: List<TVChannel> = emptyList(),
 ) : List<TVChannel> by value {
     companion object {
-        val EXAMPLE = TVChannelList(List(10) { i -> TVChannel.EXAMPLE.copy() })
+        val EXAMPLE = TVChannelList(List(10) { _ -> TVChannel.EXAMPLE.copy() })
     }
 }
diff --git a/app/src/main/java/me/lsong/mytv/iptv/TVGroup.kt b/app/src/main/java/me/lsong/mytv/iptv/TVGroup.kt
@@ -40,7 +40,7 @@ data class TVGroupList(
 ) : List<TVGroup> by value {
     companion object {
         val EXAMPLE = TVGroupList(List(5) { groupIdx ->
-            TVGroup.EXAMPLE
+            TVGroup.EXAMPLE.copy(title = "Group $groupIdx")
         })
 
         fun TVGroupList.findGroupIndex(iptv: TVChannel) =

diff --git a/app/src/main/java/me/lsong/mytv/ui/MainContent.kt b/app/src/main/java/me/lsong/mytv/ui/MainContent.kt
@@ -15,7 +15,6 @@ import androidx.compose.ui.input.key.KeyEventType
 import androidx.compose.ui.input.key.key
 import androidx.compose.ui.input.key.onPreviewKeyEvent
 import androidx.compose.ui.input.key.type
-import androidx.compose.ui.platform.LocalConfiguration
 import androidx.lifecycle.viewmodel.compose.viewModel
 import kotlinx.coroutines.delay
 import me.lsong.mytv.epg.EpgList
@@ -26,8 +25,8 @@ import me.lsong.mytv.ui.player.MyTvVideoScreen
 import me.lsong.mytv.ui.player.rememberLeanbackVideoPlayerState
 import me.lsong.mytv.ui.settings.MyTvSettingsViewModel
 import me.lsong.mytv.ui.widgets.MyTvMenu
+import me.lsong.mytv.ui.widgets.MyTvMenuWidget
 import me.lsong.mytv.ui.widgets.MyTvNowPlaying
-import me.lsong.mytv.utils.Settings
 import me.lsong.mytv.utils.handleLeanbackDragGestures
 import me.lsong.mytv.utils.handleLeanbackKeyEvents
 
@@ -119,11 +118,10 @@ fun LeanbackMainContent(
         )
 
         LeanbackVisible({ mainContentState.isMenuVisible && !mainContentState.isChannelInfoVisible }) {
-            MyTvMenu(
-                epgListProvider = { epgList },
+            MyTvMenuWidget(
                 groupListProvider = { groupList },
+                epgListProvider = { epgList },
                 channelProvider = { mainContentState.currentChannel },
-                onClose = { mainContentState.isMenuVisible = false },
                 onSelected = { channel -> mainContentState.changeCurrentChannel(channel) }
             )
         }

diff --git a/app/src/main/java/me/lsong/mytv/ui/components/ChannelItem.kt b/app/src/main/java/me/lsong/mytv/ui/components/ChannelItem.kt
diff --git a/app/src/main/java/me/lsong/mytv/ui/components/ChannelList.kt b/app/src/main/java/me/lsong/mytv/ui/components/ChannelList.kt