Optimize usage

Author: DylanCaiCoding

loadingstateview-ktx/src/main/java/com/dylanc/loadingstateview/Decorative.kt

@@ -16,6 +16,9 @@
 
 package com.dylanc.loadingstateview
 
+import android.view.View
+
 interface Decorative {
   val isDecorated: Boolean get() = true
+  val contentView: View? get() = null
 }

loadingstateview-ktx/src/main/java/com/dylanc/loadingstateview/LoadingStateDelegate.kt

@@ -30,7 +30,15 @@ class LoadingStateDelegate : LoadingState {
   }
 
   override fun View.decorate(listener: OnReloadListener?, decorative: Decorative?): View =
-    if (decorative?.isDecorated != false) LoadingStateView(this, listener).also { loadingStateView = it }.decorView else this
+    when {
+      decorative?.isDecorated == false -> this
+      decorative?.contentView == null ->
+        LoadingStateView(this, listener).also { loadingStateView = it }.decorView
+      else -> {
+        loadingStateView = LoadingStateView(decorative.contentView!!, listener)
+        this
+      }
+    }
 
   override fun registerView(vararg viewDelegates: LoadingStateView.ViewDelegate) {
     loadingStateView?.register(*viewDelegates)

sample-kotlin/src/main/java/com/dylanc/loadingstateview/sample/kotlin/base/BaseBindingActivity.kt

@@ -23,19 +23,15 @@ import com.dylanc.loadingstateview.Decorative
 import com.dylanc.loadingstateview.LoadingState
 import com.dylanc.loadingstateview.LoadingStateDelegate
 import com.dylanc.loadingstateview.OnReloadListener
-import com.dylanc.viewbinding.base.ViewBindingUtil
+import com.dylanc.viewbinding.base.ActivityBinding
+import com.dylanc.viewbinding.base.ActivityBindingDelegate
 
-abstract class BaseBindingActivity<VB : ViewBinding> : AppCompatActivity(),
-  LoadingState by LoadingStateDelegate(), OnReloadListener, Decorative {
-
-  lateinit var binding: VB private set
-
-  open val contentView get() = binding.root
+abstract class BaseBindingActivity<VB : ViewBinding> : AppCompatActivity(), OnReloadListener, Decorative,
+  LoadingState by LoadingStateDelegate(), ActivityBinding<VB> by ActivityBindingDelegate() {
 
   override fun onCreate(savedInstanceState: Bundle?) {
     super.onCreate(savedInstanceState)
-    binding = ViewBindingUtil.inflateWithGeneric(this, layoutInflater)
-    setContentView(binding.root)
-    contentView.decorate(this, this)
+    setContentViewWithBinding()
+    binding.root.decorate(this, this)
   }
 }

sample-kotlin/src/main/java/com/dylanc/loadingstateview/sample/kotlin/base/BaseBindingFragment.kt

@@ -18,38 +18,19 @@ package com.dylanc.loadingstateview.sample.kotlin.base
 
 import android.os.Bundle
 import android.view.LayoutInflater
-import android.view.View
 import android.view.ViewGroup
 import androidx.fragment.app.Fragment
 import androidx.viewbinding.ViewBinding
 import com.dylanc.loadingstateview.Decorative
 import com.dylanc.loadingstateview.LoadingState
 import com.dylanc.loadingstateview.LoadingStateDelegate
 import com.dylanc.loadingstateview.OnReloadListener
-import com.dylanc.viewbinding.base.ViewBindingUtil
+import com.dylanc.viewbinding.base.FragmentBinding
+import com.dylanc.viewbinding.base.FragmentBindingDelegate
 
-abstract class BaseBindingFragment<VB : ViewBinding> : Fragment(),
-  LoadingState by LoadingStateDelegate(), OnReloadListener, Decorative {
+abstract class BaseBindingFragment<VB : ViewBinding> : Fragment(), OnReloadListener, Decorative,
+  LoadingState by LoadingStateDelegate(), FragmentBinding<VB> by FragmentBindingDelegate() {
 
-  private var _binding: VB? = null
-  val binding get() = _binding!!
-
-  open val contentView: View? get() = null
-
-  override fun onCreateView(
-    inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?
-  ): View? {
-    _binding = ViewBindingUtil.inflateWithGeneric(this, inflater, container, false)
-    return if (contentView != null) {
-      contentView!!.decorate(this, this)
-      binding.root
-    } else {
-      binding.root.decorate(this, this)
-    }
-  }
-
-  override fun onDestroyView() {
-    super.onDestroyView()
-    _binding = null
-  }
+  override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?) =
+    createViewWithBinding(inflater, container).decorate(this, this)
 }