Use ActivityViewModelContext for activity scope

[apramana]

Fixes: #674

parentFragment should not get set if the scope is an activity.

[vulpeszerda]

@apramana
I think just removing findFragmentFromView discards some functionality.

How about this?

val parentFragment = scope as? Fragment ?: if (scope !is Activity) findFragmentFromView(view) else null

if (parentFragment != null) {
    val args = argsFactory?.invoke() ?: parentFragment.arguments?.get(Mavericks.KEY_ARG)
    FragmentViewModelContext(activity, args, parentFragment)
} else {
    val args = argsFactory?.invoke() ?: activity.intent.extras?.get(Mavericks.KEY_ARG)
    ActivityViewModelContext(activity, args, viewModelStoreOwner, savedStateRegistry)
}

[apramana]

@apramana I think just removing findFragmentFromView discards some functionality.

How about this?

val parentFragment = scope as? Fragment ?: if (scope !is Activity) findFragmentFromView(view) else null

if (parentFragment != null) {
    val args = argsFactory?.invoke() ?: parentFragment.arguments?.get(Mavericks.KEY_ARG)
    FragmentViewModelContext(activity, args, parentFragment)
} else {
    val args = argsFactory?.invoke() ?: activity.intent.extras?.get(Mavericks.KEY_ARG)
    ActivityViewModelContext(activity, args, viewModelStoreOwner, savedStateRegistry)
}

Yeah I suppose scope could be a non-fragment/activity lifecycle owner... updated to use a when expression.

[elihart]

Thanks for the fix @apramana - can you add a unit test?

[elihart]

Thanks!

[rossbacher]

@apramana This is now part of release v3.0.6 that I just made.

[apramana]

@apramana This is now part of release v3.0.6 that I just made.

Thanks @rossbacher !