Add Hilt to TV and Wear

Author: arriolac

Jetcaster/app/src/main/java/com/example/jetcaster/JetcasterApplication.kt

@@ -19,7 +19,6 @@ package com.example.jetcaster
 import android.app.Application
 import coil.ImageLoader
 import coil.ImageLoaderFactory
-import com.example.jetcaster.core.data.di.Graph
 import dagger.hilt.android.HiltAndroidApp
 import javax.inject.Inject
 

Jetcaster/core/src/main/java/com/example/jetcaster/core/data/di/Graph.kt

@@ -18,6 +18,7 @@ plugins {
     alias(libs.plugins.android.application)
     alias(libs.plugins.kotlin.android)
     alias(libs.plugins.ksp)
+    alias(libs.plugins.hilt)
 }
 
 android {
@@ -79,6 +80,11 @@ dependencies {
     implementation(libs.androidx.navigation.compose)
     implementation(libs.coil.kt.compose)
 
+    // Dependency injection
+    implementation(libs.androidx.hilt.navigation.compose)
+    implementation(libs.hilt.android)
+    ksp(libs.hilt.compiler)
+
 
     implementation(project(":core"))
     implementation(project(":designsystem"))
@@ -89,4 +95,4 @@ dependencies {
     debugImplementation(libs.androidx.compose.ui.test.manifest)
 
     coreLibraryDesugaring(libs.core.jdk.desugaring)
-}
+}

Jetcaster/tv-app/build.gradle.kts

@@ -17,12 +17,7 @@
 package com.example.jetcaster.tv
 
 import android.app.Application
-import com.example.jetcaster.core.data.di.Graph
+import dagger.hilt.android.HiltAndroidApp
 
-class JetCasterTvApp : Application() {
-
-    override fun onCreate() {
-        super.onCreate()
-        Graph.provide(this)
-    }
-}
+@HiltAndroidApp
+class JetCasterTvApp : Application()

Jetcaster/tv-app/src/main/java/com/example/jetcaster/tv/JetCasterTvApp.kt

@@ -29,7 +29,9 @@ import androidx.tv.material3.Surface
 import androidx.tv.material3.Text
 import com.example.jetcaster.tv.ui.JetcasterApp
 import com.example.jetcaster.tv.ui.theme.JetcasterTheme
+import dagger.hilt.android.AndroidEntryPoint
 
+@AndroidEntryPoint
 class MainActivity : ComponentActivity() {
     @OptIn(ExperimentalTvMaterial3Api::class)
     override fun onCreate(savedInstanceState: Bundle?) {

Jetcaster/tv-app/src/main/java/com/example/jetcaster/tv/MainActivity.kt

@@ -29,7 +29,6 @@ import androidx.compose.material.icons.filled.VideoLibrary
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.ExperimentalComposeUiApi
 import androidx.compose.ui.Modifier
-import androidx.lifecycle.viewmodel.compose.viewModel
 import androidx.navigation.compose.NavHost
 import androidx.navigation.compose.composable
 import androidx.tv.material3.ExperimentalTvMaterial3Api
@@ -40,10 +39,8 @@ import androidx.tv.material3.NavigationDrawerItem
 import androidx.tv.material3.Text
 import com.example.jetcaster.tv.ui.discover.DiscoverScreen
 import com.example.jetcaster.tv.ui.episode.EpisodeScreen
-import com.example.jetcaster.tv.ui.episode.EpisodeScreenViewModel
 import com.example.jetcaster.tv.ui.library.LibraryScreen
 import com.example.jetcaster.tv.ui.podcast.PodcastScreen
-import com.example.jetcaster.tv.ui.podcast.PodcastScreenViewModel
 import com.example.jetcaster.tv.ui.profile.ProfileScreen
 import com.example.jetcaster.tv.ui.search.SearchScreen
 import com.example.jetcaster.tv.ui.settings.SettingsScreen
@@ -165,11 +162,7 @@ private fun Route(jetcasterAppState: JetcasterAppState) {
         }
 
         composable(Screen.Podcast.route) {
-            val podcastScreenViewModel: PodcastScreenViewModel = viewModel(
-                factory = PodcastScreenViewModel.factory
-            )
             PodcastScreen(
-                podcastScreenViewModel = podcastScreenViewModel,
                 backToHomeScreen = jetcasterAppState::navigateToDiscover,
                 playEpisode = {},
                 showEpisodeDetails = { jetcasterAppState.showEpisodeDetails(it.episode.uri) },
@@ -180,15 +173,11 @@ private fun Route(jetcasterAppState: JetcasterAppState) {
         }
 
         composable(Screen.Episode.route) {
-            val episodeScreenViewModel: EpisodeScreenViewModel = viewModel(
-                factory = EpisodeScreenViewModel.factory
-            )
             EpisodeScreen(
                 playEpisode = {
                     jetcasterAppState.playEpisode(it.uri)
                 },
                 backToHome = jetcasterAppState::navigateToDiscover,
-                episodeScreenViewModel = episodeScreenViewModel,
             )
         }
 

Jetcaster/tv-app/src/main/java/com/example/jetcaster/tv/ui/JetcasterApp.kt

@@ -29,7 +29,7 @@ import androidx.compose.ui.focus.FocusRequester
 import androidx.compose.ui.focus.focusProperties
 import androidx.compose.ui.focus.focusRequester
 import androidx.compose.ui.focus.focusRestorer
-import androidx.lifecycle.viewmodel.compose.viewModel
+import androidx.hilt.navigation.compose.hiltViewModel
 import androidx.tv.foundation.lazy.list.TvLazyListState
 import androidx.tv.foundation.lazy.list.rememberTvLazyListState
 import androidx.tv.material3.ExperimentalTvMaterial3Api
@@ -52,7 +52,7 @@ fun DiscoverScreen(
     showPodcastDetails: (Podcast) -> Unit,
     showEpisodeDetails: (EpisodeToPodcast) -> Unit,
     modifier: Modifier = Modifier,
-    discoverScreenViewModel: DiscoverScreenViewModel = viewModel()
+    discoverScreenViewModel: DiscoverScreenViewModel = hiltViewModel()
 ) {
     val uiState by discoverScreenViewModel.uiState.collectAsState()
 

Jetcaster/tv-app/src/main/java/com/example/jetcaster/tv/ui/discover/DiscoverScreen.kt

@@ -19,12 +19,12 @@ package com.example.jetcaster.tv.ui.discover
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import com.example.jetcaster.core.data.database.model.Category
-import com.example.jetcaster.core.data.di.Graph
 import com.example.jetcaster.core.data.repository.CategoryStore
 import com.example.jetcaster.core.data.repository.PodcastsRepository
 import com.example.jetcaster.tv.model.CategoryList
 import com.example.jetcaster.tv.model.EpisodeList
 import com.example.jetcaster.tv.model.PodcastList
+import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.SharingStarted
@@ -34,10 +34,12 @@ import kotlinx.coroutines.flow.flowOf
 import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.flow.stateIn
 import kotlinx.coroutines.launch
+import javax.inject.Inject
 
-class DiscoverScreenViewModel(
-    private val podcastsRepository: PodcastsRepository = Graph.podcastRepository,
-    private val categoryStore: CategoryStore = Graph.categoryStore,
+@HiltViewModel
+class DiscoverScreenViewModel @Inject constructor(
+    private val podcastsRepository: PodcastsRepository,
+    private val categoryStore: CategoryStore,
 ) : ViewModel() {
 
     private val _selectedCategory = MutableStateFlow<Category?>(null)

Jetcaster/tv-app/src/main/java/com/example/jetcaster/tv/ui/discover/DiscoverScreenViewModel.kt

@@ -30,7 +30,7 @@ import androidx.compose.runtime.getValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.text.style.TextOverflow
-import androidx.lifecycle.viewmodel.compose.viewModel
+import androidx.hilt.navigation.compose.hiltViewModel
 import androidx.tv.material3.ExperimentalTvMaterial3Api
 import androidx.tv.material3.MaterialTheme
 import androidx.tv.material3.Text
@@ -50,7 +50,7 @@ fun EpisodeScreen(
     playEpisode: (Episode) -> Unit,
     backToHome: () -> Unit,
     modifier: Modifier = Modifier,
-    episodeScreenViewModel: EpisodeScreenViewModel = viewModel()
+    episodeScreenViewModel: EpisodeScreenViewModel = hiltViewModel()
 ) {
 
     val uiState by episodeScreenViewModel.uiStateFlow.collectAsState()

Jetcaster/tv-app/src/main/java/com/example/jetcaster/tv/ui/episode/EpisodeScreen.kt

@@ -16,26 +16,27 @@
 
 package com.example.jetcaster.tv.ui.episode
 
-import androidx.lifecycle.AbstractSavedStateViewModelFactory
 import androidx.lifecycle.SavedStateHandle
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import com.example.jetcaster.core.data.database.model.Episode
 import com.example.jetcaster.core.data.database.model.EpisodeToPodcast
-import com.example.jetcaster.core.data.di.Graph
 import com.example.jetcaster.core.data.repository.EpisodeStore
 import com.example.jetcaster.core.data.repository.PodcastsRepository
 import com.example.jetcaster.tv.ui.Screen
+import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.flow.SharingStarted
 import kotlinx.coroutines.flow.flowOf
 import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.flow.stateIn
 import kotlinx.coroutines.launch
+import javax.inject.Inject
 
-class EpisodeScreenViewModel(
+@HiltViewModel
+class EpisodeScreenViewModel @Inject constructor(
     handle: SavedStateHandle,
-    podcastsRepository: PodcastsRepository = Graph.podcastRepository,
-    episodeStore: EpisodeStore = Graph.episodeStore,
+    podcastsRepository: PodcastsRepository,
+    episodeStore: EpisodeStore,
 ) : ViewModel() {
 
     private val episodeUri = handle.get<String>(Screen.Episode.PARAMETER_NAME)
@@ -70,21 +71,6 @@ class EpisodeScreenViewModel(
             podcastsRepository.updatePodcasts(false)
         }
     }
-
-    companion object {
-        @Suppress("UNCHECKED_CAST")
-        val factory = object : AbstractSavedStateViewModelFactory() {
-            override fun <T : ViewModel> create(
-                key: String,
-                modelClass: Class<T>,
-                handle: SavedStateHandle
-            ): T {
-                return EpisodeScreenViewModel(
-                    handle
-                ) as T
-            }
-        }
-    }
 }
 
 sealed interface EpisodeScreenUiState {