Optimize Activity.kt

DylanCaiCoding · DylanCaiCoding · commit 137c9482067a · 2022-02-17T15:36:01.000+08:00
diff --git a/viewbinding-ktx/src/main/java/com/dylanc/viewbinding/Activity.kt b/viewbinding-ktx/src/main/java/com/dylanc/viewbinding/Activity.kt
@@ -22,9 +22,9 @@ import androidx.activity.ComponentActivity
 import androidx.databinding.ViewDataBinding
 import androidx.viewbinding.ViewBinding
 
-inline fun <reified VB : ViewBinding> ComponentActivity.binding() = lazy {
+inline fun <reified VB : ViewBinding> ComponentActivity.binding(setContentView: Boolean = true) = lazy {
   inflateBinding<VB>(layoutInflater).also { binding ->
-    setContentView(binding.root)
+    if (setContentView) setContentView(binding.root)
     if (binding is ViewDataBinding) binding.lifecycleOwner = this
   }
 }
diff --git a/viewbinding-nonreflection-ktx/src/main/java/com/dylanc/viewbinding/nonreflection/Activity.kt b/viewbinding-nonreflection-ktx/src/main/java/com/dylanc/viewbinding/nonreflection/Activity.kt
@@ -21,9 +21,9 @@ import androidx.activity.ComponentActivity
 import androidx.databinding.ViewDataBinding
 import androidx.viewbinding.ViewBinding
 
-fun <VB : ViewBinding> ComponentActivity.binding(inflate: (LayoutInflater) -> VB) = lazy {
+fun <VB : ViewBinding> ComponentActivity.binding(inflate: (LayoutInflater) -> VB, setContentView: Boolean = true) = lazy {
   inflate(layoutInflater).also { binding ->
-    setContentView(binding.root)
+    if (setContentView) setContentView(binding.root)
     if (binding is ViewDataBinding) binding.lifecycleOwner = this
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -22,9 +22,9 @@ import androidx.activity.ComponentActivity`
`22`	`22`	`import androidx.databinding.ViewDataBinding`
`23`	`23`	`import androidx.viewbinding.ViewBinding`
`24`	`24`
`25`		`-inline fun <reified VB : ViewBinding> ComponentActivity.binding() = lazy {`
	`25`	`+inline fun <reified VB : ViewBinding> ComponentActivity.binding(setContentView: Boolean = true) = lazy {`
`26`	`26`	`inflateBinding<VB>(layoutInflater).also { binding ->`
`27`		`- setContentView(binding.root)`
	`27`	`+ if (setContentView) setContentView(binding.root)`
`28`	`28`	`if (binding is ViewDataBinding) binding.lifecycleOwner = this`
`29`	`29`	`}`
`30`	`30`	`}`
Original file line number	Diff line number	Diff line change
`@@ -21,9 +21,9 @@ import androidx.activity.ComponentActivity`
`21`	`21`	`import androidx.databinding.ViewDataBinding`
`22`	`22`	`import androidx.viewbinding.ViewBinding`
`23`	`23`
`24`		`-fun <VB : ViewBinding> ComponentActivity.binding(inflate: (LayoutInflater) -> VB) = lazy {`
	`24`	`+fun <VB : ViewBinding> ComponentActivity.binding(inflate: (LayoutInflater) -> VB, setContentView: Boolean = true) = lazy {`
`25`	`25`	`inflate(layoutInflater).also { binding ->`
`26`		`- setContentView(binding.root)`
	`26`	`+ if (setContentView) setContentView(binding.root)`
`27`	`27`	`if (binding is ViewDataBinding) binding.lifecycleOwner = this`
`28`	`28`	`}`
`29`	`29`	`}`