Use navigation scoped ViewModel for AppViewModel

buildSrc/src/main/java/Dep.kt

@@ -10,7 +10,7 @@ object Dep {
         const val activity = "androidx.activity:activity-compose:1.3.0"
         const val constraintLayout =
             "androidx.constraintlayout:constraintlayout-compose:1.0.0-beta02"
-        const val navigation = "androidx.navigation:navigation-compose:2.4.0-alpha05"
+        const val navigation = "androidx.navigation:navigation-compose:2.4.0-alpha06"
         const val livedata = "androidx.compose.runtime:runtime-livedata:${Versions.compose}"
         const val runtime = "androidx.compose.runtime:runtime:${Versions.compose}"
         const val foundation = "androidx.compose.foundation:foundation:${Versions.compose}"
@@ -23,6 +23,7 @@ object Dep {
         const val iconsExtended =
             "androidx.compose.material:material-icons-extended:${Versions.compose}"
         const val animation = "androidx.compose.animation:animation:${Versions.compose}"
+        const val hiltNavigationCompose = "androidx.hilt:hilt-navigation-compose:1.0.0-alpha03"
     }
 
     object Jetpack {

uicomponent-compose/feed/build.gradle

@@ -67,6 +67,7 @@ dependencies {
     // https://github.com/android/compose-samples/blob/master/JetNews/app/build.gradle#L66
     implementation Dep.Compose.constraintLayout
     implementation Dep.Compose.navigation
+    implementation Dep.Compose.hiltNavigationCompose
     implementation Dep.Compose.runtime
     implementation Dep.Compose.livedata
     implementation Dep.Compose.foundation

uicomponent-compose/main/build.gradle

@@ -74,6 +74,7 @@ dependencies {
     // https://github.com/android/compose-samples/blob/master/JetNews/app/build.gradle#L66
     implementation Dep.Compose.activity
     implementation Dep.Compose.navigation
+    implementation Dep.Compose.hiltNavigationCompose
     implementation Dep.Compose.runtime
     implementation Dep.Compose.livedata
     implementation Dep.Compose.foundation

uicomponent-compose/main/src/main/java/io/github/droidkaigi/feeder/AppContent.kt

@@ -23,7 +23,6 @@ import androidx.navigation.compose.composable
 import androidx.navigation.compose.navArgument
 import androidx.navigation.navDeepLink
 import com.google.accompanist.systemuicontroller.rememberSystemUiController
-import io.github.droidkaigi.feeder.core.R as CoreR
 import io.github.droidkaigi.feeder.core.navigation.chromeCustomTabs
 import io.github.droidkaigi.feeder.core.navigation.navigateChromeCustomTabs
 import io.github.droidkaigi.feeder.core.navigation.rememberCustomNavController
@@ -32,6 +31,7 @@ import io.github.droidkaigi.feeder.feed.FeedTab
 import io.github.droidkaigi.feeder.other.OtherScreen
 import io.github.droidkaigi.feeder.other.OtherTab
 import kotlinx.coroutines.launch
+import io.github.droidkaigi.feeder.core.R as CoreR
 
 private const val FEED_PATH = "feed/"
 private const val OTHER_PATH = "other/"

uicomponent-compose/main/src/main/java/io/github/droidkaigi/feeder/AppViewModel.kt

@@ -1,7 +1,7 @@
 package io.github.droidkaigi.feeder
 
 import androidx.compose.runtime.Composable
-import androidx.compose.runtime.compositionLocalOf
+import androidx.compose.runtime.staticCompositionLocalOf
 import io.github.droidkaigi.feeder.core.UnidirectionalViewModel
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.StateFlow
@@ -26,11 +26,17 @@ interface AppViewModel :
     override fun event(event: Event)
 }
 
-private val LocalAppViewModel = compositionLocalOf<AppViewModel> {
-    error("not LocalDroidKaigiAppViewModel provided")
-}
+private val LocalAppViewModelFactory =
+    staticCompositionLocalOf<@Composable () -> AppViewModel> {
+        {
+            error("not LocalDroidKaigiAppViewModel provided")
+        }
+    }
 
-fun appViewModelProviderValue(viewModel: AppViewModel) = LocalAppViewModel provides viewModel
+fun provideAppViewModelFactory(viewModelFactory: @Composable () -> AppViewModel) =
+    LocalAppViewModelFactory provides viewModelFactory
 
 @Composable
-fun appViewModel() = LocalAppViewModel.current
+fun appViewModel(): AppViewModel {
+    return LocalAppViewModelFactory.current()
+}

uicomponent-compose/main/src/main/java/io/github/droidkaigi/feeder/viewmodel/ProvideRealViewModels.kt

@@ -2,19 +2,22 @@ package io.github.droidkaigi.feeder.viewmodel
 
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.CompositionLocalProvider
+import androidx.hilt.navigation.compose.hiltViewModel
 import androidx.lifecycle.viewmodel.compose.viewModel
-import io.github.droidkaigi.feeder.appViewModelProviderValue
 import io.github.droidkaigi.feeder.contributor.contributorViewModelProviderValue
 import io.github.droidkaigi.feeder.contributor.fakeContributorViewModel
 import io.github.droidkaigi.feeder.feed.feedViewModelProviderValue
 import io.github.droidkaigi.feeder.feed.fmPlayerViewModelProviderValue
+import io.github.droidkaigi.feeder.provideAppViewModelFactory
 import io.github.droidkaigi.feeder.setting.settingViewModelProviderValue
 import io.github.droidkaigi.feeder.staff.staffViewModelProviderValue
 
 @Composable
 fun ProvideViewModels(content: @Composable () -> Unit) {
     CompositionLocalProvider(
-        appViewModelProviderValue(viewModel<RealAppViewModel>()),
+        provideAppViewModelFactory {
+            hiltViewModel<RealAppViewModel>()
+        },
         feedViewModelProviderValue(viewModel<RealFeedViewModel>()),
         settingViewModelProviderValue(viewModel<RealSettingViewModel>()),
         staffViewModelProviderValue(viewModel<RealStaffViewModel>()),