Make inflateBinding as a default impl (#376)

Follow up 90cb05d.
Goooler · Apr 13, 2023 · 224b8d1 · 224b8d1
1 parent 3c488be
commit 224b8d1
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 24 deletions.
diff --git a/common/src/main/kotlin/io/goooler/demoapp/common/base/binding/BaseBindingActivity.kt b/common/src/main/kotlin/io/goooler/demoapp/common/base/binding/BaseBindingActivity.kt
@@ -10,7 +10,6 @@ import com.blankj.utilcode.util.AdaptScreenUtils
 import com.blankj.utilcode.util.BarUtils
 import com.blankj.utilcode.util.ScreenUtils
 import io.goooler.demoapp.base.core.BaseActivity
-import io.goooler.demoapp.common.base.binding.IBinding.Companion.inflateBinding
 
 abstract class BaseBindingActivity<VB : ViewDataBinding> : BaseActivity(), IBinding<VB> {
 

diff --git a/common/src/main/kotlin/io/goooler/demoapp/common/base/binding/BaseBindingDialogFragment.kt b/common/src/main/kotlin/io/goooler/demoapp/common/base/binding/BaseBindingDialogFragment.kt
@@ -8,7 +8,6 @@ import android.view.View
 import android.view.ViewGroup
 import androidx.databinding.ViewDataBinding
 import io.goooler.demoapp.base.core.BaseDialogFragment
-import io.goooler.demoapp.common.base.binding.IBinding.Companion.inflateBinding
 
 abstract class BaseBindingDialogFragment<VB : ViewDataBinding> :
   BaseDialogFragment(),

diff --git a/common/src/main/kotlin/io/goooler/demoapp/common/base/binding/BaseBindingFragment.kt b/common/src/main/kotlin/io/goooler/demoapp/common/base/binding/BaseBindingFragment.kt
@@ -6,7 +6,6 @@ import android.view.View
 import android.view.ViewGroup
 import androidx.databinding.ViewDataBinding
 import io.goooler.demoapp.base.core.BaseFragment
-import io.goooler.demoapp.common.base.binding.IBinding.Companion.inflateBinding
 
 abstract class BaseBindingFragment<VB : ViewDataBinding> :
   BaseFragment(),

diff --git a/common/src/main/kotlin/io/goooler/demoapp/common/base/binding/IBinding.kt b/common/src/main/kotlin/io/goooler/demoapp/common/base/binding/IBinding.kt
@@ -10,30 +10,28 @@ import java.lang.reflect.ParameterizedType
 internal sealed interface IBinding<VB : ViewDataBinding> {
   val binding: VB
 
-  companion object {
-    @Suppress("UNCHECKED_CAST")
-    internal fun <T : ViewBinding> IBinding<*>.inflateBinding(inflater: LayoutInflater): T {
-      var method: Method?
-      var clazz: Class<*> = javaClass
-      while (clazz.superclass != null) {
-        method = clazz.filterBindingMethod()
-        if (method == null) {
-          clazz = clazz.superclass
-        } else {
-          return method.invoke(null, inflater) as T
-        }
+  fun <T : ViewBinding> inflateBinding(inflater: LayoutInflater): T {
+    var method: Method?
+    var clazz: Class<*> = javaClass
+    while (clazz.superclass != null) {
+      method = clazz.filterBindingMethod()
+      if (method == null) {
+        clazz = clazz.superclass
+      } else {
+        @Suppress("UNCHECKED_CAST")
+        return method.invoke(null, inflater) as T
       }
-      error("No Binding type argument found.")
     }
+    error("No Binding type argument found.")
+  }
 
-    private fun Class<*>.filterBindingMethod(): Method? {
-      return (genericSuperclass as? ParameterizedType)?.actualTypeArguments
-        ?.asSequence()
-        ?.filterIsInstance<Class<*>>()
-        ?.firstOrNull { it.simpleName.endsWith("Binding") }
-        ?.getDeclaredMethod("inflate", LayoutInflater::class.java)
-        ?.also { it.isAccessible = true }
-    }
+  private fun Class<*>.filterBindingMethod(): Method? {
+    return (genericSuperclass as? ParameterizedType)?.actualTypeArguments
+      ?.asSequence()
+      ?.filterIsInstance<Class<*>>()
+      ?.firstOrNull { it.simpleName.endsWith("Binding") }
+      ?.getDeclaredMethod("inflate", LayoutInflater::class.java)
+      ?.also { it.isAccessible = true }
   }
 }