Milan Jurkulak 3 yıl önce
ebeveyn
işleme
bce15aec2a

+ 3 - 3
app/src/main/kotlin/org/mjdev/tvapp/ui/screens/DetailScreen.kt

@@ -19,7 +19,7 @@ import androidx.compose.ui.graphics.vector.ImageVector
 import androidx.navigation.navArgument
 import org.mjdev.tvapp.R
 import org.mjdev.tvapp.data.local.Movie
-import org.mjdev.tvapp.viewmodel.IPTVViewModel
+import org.mjdev.tvapp.viewmodel.DetailViewModel
 import org.mjdev.tvlib.annotations.TvPreview
 import org.mjdev.tvlib.extensions.HiltExt.appViewModel
 import org.mjdev.tvlib.interfaces.ItemAudio
@@ -50,8 +50,8 @@ class DetailScreen : Screen() {
     @Composable
     override fun ComposeScreen() {
 
-        val viewModel: IPTVViewModel = appViewModel { context ->
-            IPTVViewModel.mockIPTVViewModel(context)
+        val viewModel: DetailViewModel = appViewModel { context ->
+            DetailViewModel.mockDetailViewModel(context)
         }
 
         val data: Any? = args[data]

+ 6 - 6
app/src/main/kotlin/org/mjdev/tvapp/ui/screens/IPTVScreen.kt

@@ -24,7 +24,7 @@ import androidx.compose.ui.graphics.vector.ImageVector
 import androidx.navigation.navArgument
 import org.mjdev.tvapp.R
 import org.mjdev.tvapp.data.local.Movie
-import org.mjdev.tvapp.viewmodel.IPTVViewModel
+import org.mjdev.tvapp.viewmodel.DetailViewModel
 import org.mjdev.tvlib.annotations.TvPreview
 import org.mjdev.tvlib.extensions.HiltExt.appViewModel
 import org.mjdev.tvlib.extensions.StringExt.parseUri
@@ -58,17 +58,17 @@ class IPTVScreen : Screen() {
     @Composable
     override fun ComposeScreen() {
 
-        val viewModel: IPTVViewModel = appViewModel { context ->
-            IPTVViewModel.mockIPTVViewModel(context)
+        val viewModel: DetailViewModel = appViewModel { context ->
+            DetailViewModel.mockDetailViewModel(context)
         }
 
         val data: Any? = remember { args[data] }
 
         val dataList = remember {
             when (data) {
-                is ItemAudio -> viewModel.localAudioCursor.asList()
-                is ItemVideo -> viewModel.localVideoCursor.asList()
-                is ItemPhoto -> viewModel.localPhotoCursor.asList()
+                is ItemAudio -> viewModel.localAudioCursor
+                is ItemVideo -> viewModel.localVideoCursor
+                is ItemPhoto -> viewModel.localPhotoCursor
                 is Movie -> viewModel.movieList()
                 else -> listOf(data)
             }

+ 3 - 3
app/src/main/kotlin/org/mjdev/tvapp/viewmodel/IPTVViewModel.kt → app/src/main/kotlin/org/mjdev/tvapp/viewmodel/DetailViewModel.kt

@@ -23,7 +23,7 @@ import org.mjdev.tvlib.network.NetworkConnectivityServiceImpl
 import javax.inject.Inject
 
 @HiltViewModel
-class IPTVViewModel @Inject constructor() : BaseViewModel() {
+class DetailViewModel @Inject constructor() : BaseViewModel() {
 
     @Inject
     lateinit var movieRepository: IMovieRepository
@@ -47,9 +47,9 @@ class IPTVViewModel @Inject constructor() : BaseViewModel() {
     companion object {
 
         @Suppress("unused")
-        fun mockIPTVViewModel(
+        fun mockDetailViewModel(
             context: Context
-        ): IPTVViewModel = IPTVViewModel().apply {
+        ): DetailViewModel = DetailViewModel().apply {
             movieRepository = MovieRepository(DAO(context))
             networkInfo = NetworkConnectivityServiceImpl(context)
             localAudioCursor = AudioCursor(context)