Simplify the code in the base class

Author: DylanCaiCoding

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

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

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

@@ -21,11 +21,17 @@ import android.view.View
 import androidx.annotation.StringRes
 import androidx.fragment.app.Fragment
 
-interface LoadingState {
+interface LoadingState : Decorative, OnReloadListener {
 
-  fun Activity.decorateContentView(listener: OnReloadListener? = null, decorative: Decorative? = null)
+  @Deprecated("Use Activity.decorateContentView(this) instead", ReplaceWith("decorateContentView(decorative)"))
+  fun Activity.decorateContentView(listener: OnReloadListener, decorative: Decorative) = decorateContentView(decorative)
 
-  fun View.decorate(listener: OnReloadListener? = null, decorative: Decorative? = null): View
+  fun Activity.decorateContentView(decorative: Decorative)
+
+  @Deprecated("Use View.decorate(this) instead", ReplaceWith("decorate(decorative)"))
+  fun View.decorate(listener: OnReloadListener, decorative: Decorative): View = decorate(decorative)
+
+  fun View.decorate(decorative: Decorative): View
 
   fun registerView(vararg viewDelegates: LoadingStateView.ViewDelegate)
 

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

@@ -25,17 +25,17 @@ import androidx.fragment.app.Fragment
 class LoadingStateDelegate : LoadingState {
   private var loadingStateView: LoadingStateView? = null
 
-  override fun Activity.decorateContentView(listener: OnReloadListener?, decorative: Decorative?) {
-    findViewById<ViewGroup>(android.R.id.content).getChildAt(0).decorate(listener, decorative)
+  override fun Activity.decorateContentView(decorative: Decorative) {
+    findViewById<ViewGroup>(android.R.id.content).getChildAt(0).decorate(decorative)
   }
 
-  override fun View.decorate(listener: OnReloadListener?, decorative: Decorative?): View =
+  override fun View.decorate(decorative: Decorative): View =
     when {
-      decorative?.isDecorated == false -> this
-      decorative?.contentView == null ->
-        LoadingStateView(this, listener).also { loadingStateView = it }.decorView
+      !decorative.isDecorated -> this
+      decorative.contentView == null ->
+        LoadingStateView(this, decorative).also { loadingStateView = it }.decorView
       else -> {
-        loadingStateView = LoadingStateView(decorative.contentView!!, listener)
+        loadingStateView = LoadingStateView(decorative.contentView!!, decorative)
         this
       }
     }
@@ -57,7 +57,7 @@ class LoadingStateDelegate : LoadingState {
   }
 
   override fun Fragment.setToolbar(title: String?, navBtnType: NavBtnType, block: (ToolbarConfig.() -> Unit)?) {
-    loadingStateView?.setHeaders(ToolbarViewDelegate(title, navBtnType, block))
+    loadingStateView?.addChildHeaders(ToolbarViewDelegate(title, navBtnType, block))
   }
 
   override fun Activity.setHeaders(vararg delegates: LoadingStateView.ViewDelegate) {

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

@@ -18,17 +18,14 @@ package com.dylanc.loadingstateview.sample.kotlin.base
 
 import android.os.Bundle
 import androidx.appcompat.app.AppCompatActivity
-import com.dylanc.loadingstateview.Decorative
 import com.dylanc.loadingstateview.LoadingState
 import com.dylanc.loadingstateview.LoadingStateDelegate
-import com.dylanc.loadingstateview.OnReloadListener
 
-abstract class BaseActivity(private val layoutRes: Int) : AppCompatActivity(),
-  LoadingState by LoadingStateDelegate(), OnReloadListener, Decorative {
+abstract class BaseActivity(private val layoutRes: Int) : AppCompatActivity(), LoadingState by LoadingStateDelegate() {
 
   override fun onCreate(savedInstanceState: Bundle?) {
     super.onCreate(savedInstanceState)
     setContentView(layoutRes)
-    decorateContentView(this, this)
+    decorateContentView(this)
   }
 }

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

@@ -19,20 +19,17 @@ package com.dylanc.loadingstateview.sample.kotlin.base
 import android.os.Bundle
 import androidx.appcompat.app.AppCompatActivity
 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.ActivityBinding
 import com.dylanc.viewbinding.base.ActivityBindingDelegate
 
 abstract class BaseBindingActivity<VB : ViewBinding> : AppCompatActivity(),
-  LoadingState by LoadingStateDelegate(), OnReloadListener, Decorative,
-  ActivityBinding<VB> by ActivityBindingDelegate() {
+  LoadingState by LoadingStateDelegate(), ActivityBinding<VB> by ActivityBindingDelegate() {
 
   override fun onCreate(savedInstanceState: Bundle?) {
     super.onCreate(savedInstanceState)
     setContentViewWithBinding()
-    binding.root.decorate(this, this)
+    binding.root.decorate(this)
   }
 }

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

@@ -18,24 +18,17 @@ 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.FragmentBinding
 import com.dylanc.viewbinding.base.FragmentBindingDelegate
 
-abstract class BaseBindingFragment<VB : ViewBinding> : Fragment(),
-  LoadingState by LoadingStateDelegate(), OnReloadListener, Decorative,
+abstract class BaseBindingFragment<VB : ViewBinding> : Fragment(), LoadingState by LoadingStateDelegate(),
   FragmentBinding<VB> by FragmentBindingDelegate() {
 
-  override fun onCreateView(
-    inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?
-  ): View? {
-    return createViewWithBinding(inflater, container).decorate(this, this)
-  }
+  override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?) =
+    createViewWithBinding(inflater, container).decorate(this)
 }

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

@@ -18,21 +18,13 @@ 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 com.dylanc.loadingstateview.Decorative
 import com.dylanc.loadingstateview.LoadingState
 import com.dylanc.loadingstateview.LoadingStateDelegate
-import com.dylanc.loadingstateview.OnReloadListener
 
-abstract class BaseFragment(private val layoutRes: Int) : Fragment(),
-  LoadingState by LoadingStateDelegate(), OnReloadListener, Decorative {
+abstract class BaseFragment(private val layoutRes: Int) : Fragment(), LoadingState by LoadingStateDelegate() {
 
-  override fun onCreateView(
-    inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?
-  ): View? {
-    val root = inflater.inflate(layoutRes, container, false)
-    return root.decorate(this, this)
-  }
+  override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?) =
+    inflater.inflate(layoutRes, container, false).decorate(this)
 }