Make subScreen DSL return the created screen

Maxr1998 · Maxr1998 · commit f9a575963f1a · 2020-10-02T22:05:16.000+02:00
diff --git a/library/src/main/java/de/Maxr1998/modernpreferences/helpers/PreferencesDsl.kt b/library/src/main/java/de/Maxr1998/modernpreferences/helpers/PreferencesDsl.kt
@@ -39,8 +39,8 @@ inline fun screen(context: Context?, block: PreferenceScreen.Builder.() -> Unit)
 
 val emptyScreen: PreferenceScreen by lazy { screen(null) {} }
 
-inline fun PreferenceScreen.Builder.subScreen(key: String = "", block: PreferenceScreen.Builder.() -> Unit) {
-    addPreferenceItem(PreferenceScreen.Builder(this, key).apply(block).build())
+inline fun PreferenceScreen.Builder.subScreen(key: String = "", block: PreferenceScreen.Builder.() -> Unit): PreferenceScreen {
+    return PreferenceScreen.Builder(this, key).apply(block).build().also(::addPreferenceItem)
 }
 
 // Preference DSL functions

Original file line number	Diff line number	Diff line change
`@@ -39,8 +39,8 @@ inline fun screen(context: Context?, block: PreferenceScreen.Builder.() -> Unit)`
`39`	`39`
`40`	`40`	`val emptyScreen: PreferenceScreen by lazy { screen(null) {} }`
`41`	`41`
`42`		`-inline fun PreferenceScreen.Builder.subScreen(key: String = "", block: PreferenceScreen.Builder.() -> Unit) {`
`43`		`- addPreferenceItem(PreferenceScreen.Builder(this, key).apply(block).build())`
	`42`	`+inline fun PreferenceScreen.Builder.subScreen(key: String = "", block: PreferenceScreen.Builder.() -> Unit): PreferenceScreen {`
	`43`	`+ return PreferenceScreen.Builder(this, key).apply(block).build().also(::addPreferenceItem)`
`44`	`44`	`}`
`45`	`45`
`46`	`46`	`// Preference DSL functions`