Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add tag argument to Screen.getScreenModel #101

Merged
merged 3 commits into from Mar 18, 2023
Merged

Add tag argument to Screen.getScreenModel #101

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
cc9ab47
Add `tag` argument to `Screen.getScreenModel`
arslan-charyyev-pc Dec 10, 2022
95d5ef2
Merge branch 'main' into patch-1
arslan-charyyev-pc Mar 13, 2023
d7fffd3
fixed line endings?
arslan-charyyev-pc Mar 13, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
9 changes: 6 additions & 3 deletions voyager-hilt/src/main/java/cafe/adriel/voyager/hilt/ScreenModel.kt
View file
Open in desktop
Expand Up @@ -14,9 +14,11 @@ import dagger.hilt.android.EntryPointAccessors
* @return A new instance of [ScreenModel] or the same instance remembered by the composition
*/
@Composable
public inline fun <reified T : ScreenModel> Screen.getScreenModel(): T {
public inline fun <reified T : ScreenModel> Screen.getScreenModel(
tag: String? = null
): T {
val context = LocalContext.current
return rememberScreenModel {
return rememberScreenModel(tag) {
val screenModels = EntryPointAccessors
.fromActivity(context.componentActivity, ScreenModelEntryPoint::class.java)
.screenModels()
Expand All @@ -38,10 +40,11 @@ public inline fun <reified T : ScreenModel> Screen.getScreenModel(): T {
*/
@Composable
public inline fun <reified T : ScreenModel, reified F : ScreenModelFactory> Screen.getScreenModel(
tag: String? = null,
noinline factory: (F) -> T
): T {
val context = LocalContext.current
return rememberScreenModel {
return rememberScreenModel(tag) {
val screenFactories = EntryPointAccessors
.fromActivity(context.componentActivity, ScreenModelEntryPoint::class.java)
.screenModelFactories()
Expand Down