Skip to content

Commit

Permalink
Fix lint erors
Browse files Browse the repository at this point in the history
  • Loading branch information
ghostbear committed Dec 10, 2023
1 parent 8c22eaa commit 9f3f1b3
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 5 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -15,5 +15,4 @@ class HiltDetailsViewModel @AssistedInject constructor(
interface Factory {
fun create(index: Int): HiltDetailsViewModel
}

}
10 changes: 6 additions & 4 deletions voyager-hilt/src/main/java/cafe/adriel/voyager/hilt/ViewModel.kt
Original file line number Diff line number Diff line change
Expand Up @@ -65,8 +65,8 @@ public inline fun <reified T : ViewModel> Screen.getViewModel(
@Composable
public inline fun <reified VM : ViewModel, F> Screen.getViewModel(
viewModelProviderFactory: ViewModelProvider.Factory? = null,
noinline viewModelFactory: (F) -> VM,
) : VM {
noinline viewModelFactory: (F) -> VM
): VM {
val context = LocalContext.current
val lifecycleOwner = LocalLifecycleOwner.current
val viewModelStoreOwner = checkNotNull(LocalViewModelStoreOwner.current) {
Expand All @@ -80,11 +80,13 @@ public inline fun <reified VM : ViewModel, F> Screen.getViewModel(
"$viewModelStoreOwner is null or have a null viewModelStore"
}

val creationExtras = hasDefaultViewModelProviderFactory.defaultViewModelCreationExtras.withCreationCallback(viewModelFactory)
val creationExtras = hasDefaultViewModelProviderFactory.defaultViewModelCreationExtras
.withCreationCallback(viewModelFactory)

val factory = VoyagerHiltViewModelFactories.getVoyagerFactory(
activity = context.componentActivity,
delegateFactory = viewModelProviderFactory ?: hasDefaultViewModelProviderFactory.defaultViewModelProviderFactory
delegateFactory = viewModelProviderFactory
?: hasDefaultViewModelProviderFactory.defaultViewModelProviderFactory
)

val provider = ViewModelProvider(
Expand Down

0 comments on commit 9f3f1b3

Please sign in to comment.