Fixed
Status Update
Comments
ku...@google.com <ku...@google.com>
ap...@google.com <ap...@google.com> #2
Project: platform/frameworks/support
Branch: androidx-main
commit 0bd253de24bea5e6bc1a85405b7f9b9d365395ac
Author: Kuan-Ying Chou <kuanyingchou@google.com>
Date: Thu Nov 10 17:46:22 2022
Accept HasDefaultViewModelProviderFactory in hiltViewModel()
We excluded ViewModelStoreOwners that's not a NavBackStackEntry.
In this CL we accept it as long as it's a HasDefaultViewModelProviderFactory
as we can now get defaultArgs and savedStateRegistryOwner from
creationExtras.
Test: HiltViewModelComposeTest
Bug: b/249548618 , b/195190169
Relnote: Accept HasDefaultViewModelProviderFactory in hiltViewModel()
Change-Id: I10ab6e8b08e4eb2d27e0d7979e4a4f6663798245
M hilt/hilt-navigation-compose/src/androidTest/java/androidx/hilt/navigation/compose/HiltViewModelComposeTest.kt
M hilt/hilt-navigation-compose/src/main/java/androidx/hilt/navigation/compose/HiltViewModel.kt
M hilt/hilt-navigation-fragment/src/main/java/androidx/hilt/navigation/fragment/HiltNavGraphViewModelLazy.kt
M hilt/hilt-navigation/api/current.txt
M hilt/hilt-navigation/api/public_plus_experimental_current.txt
M hilt/hilt-navigation/api/restricted_current.txt
M hilt/hilt-navigation/src/main/java/androidx/hilt/navigation/HiltNavBackStackEntry.kt
https://android-review.googlesource.com/2297543
Branch: androidx-main
commit 0bd253de24bea5e6bc1a85405b7f9b9d365395ac
Author: Kuan-Ying Chou <kuanyingchou@google.com>
Date: Thu Nov 10 17:46:22 2022
Accept HasDefaultViewModelProviderFactory in hiltViewModel()
We excluded ViewModelStoreOwners that's not a NavBackStackEntry.
In this CL we accept it as long as it's a HasDefaultViewModelProviderFactory
as we can now get defaultArgs and savedStateRegistryOwner from
creationExtras.
Test: HiltViewModelComposeTest
Bug:
Relnote: Accept HasDefaultViewModelProviderFactory in hiltViewModel()
Change-Id: I10ab6e8b08e4eb2d27e0d7979e4a4f6663798245
M hilt/hilt-navigation-compose/src/androidTest/java/androidx/hilt/navigation/compose/HiltViewModelComposeTest.kt
M hilt/hilt-navigation-compose/src/main/java/androidx/hilt/navigation/compose/HiltViewModel.kt
M hilt/hilt-navigation-fragment/src/main/java/androidx/hilt/navigation/fragment/HiltNavGraphViewModelLazy.kt
M hilt/hilt-navigation/api/current.txt
M hilt/hilt-navigation/api/public_plus_experimental_current.txt
M hilt/hilt-navigation/api/restricted_current.txt
M hilt/hilt-navigation/src/main/java/androidx/hilt/navigation/HiltNavBackStackEntry.kt
Description
Now that Creation Extras is available
hiltViewModel()
should not special case nav back stack owner to get the default arguments while ignoring passed vm owner, instead the args should be retrieved from the creation extras.See:https://cs.android.com/androidx/platform/frameworks/support/+/androidx-main:hilt/hilt-navigation-compose/src/main/java/androidx/hilt/navigation/compose/HiltViewModel.kt;l=55?q=hiltviewmodel