Optimize usage

Author: DylanCaiCoding

loadingstateview-ktx/build.gradle

@@ -20,12 +20,15 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
         }
     }
+
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8
     }
+
     kotlinOptions {
         jvmTarget = '1.8'
+        freeCompilerArgs += ['-module-name', "loading_state_view_ktx",]
     }
 }
 

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

@@ -0,0 +1,5 @@
+package com.dylanc.loadingstateview
+
+interface Decorative {
+  val isDecorated: Boolean get() = true
+}

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

@@ -23,9 +23,9 @@ import androidx.fragment.app.Fragment
 
 interface LoadingState {
 
-  fun Activity.decorateContentView(listener: OnReloadListener? = null, isDecorated: Boolean = true)
+  fun Activity.decorateContentView(listener: OnReloadListener? = null, decorative: Decorative? = null)
 
-  fun View.decorate(listener: OnReloadListener? = null, isDecorated: Boolean = true): View
+  fun View.decorate(listener: OnReloadListener? = null, decorative: Decorative? = null): View
 
   fun registerView(vararg viewDelegates: LoadingStateView.ViewDelegate)
 

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

@@ -22,15 +22,15 @@ import android.view.ViewGroup
 import androidx.annotation.StringRes
 import androidx.fragment.app.Fragment
 
-class LoadingStateImpl : LoadingState {
+class LoadingStateDelegate : LoadingState {
   private var loadingStateView: LoadingStateView? = null
 
-  override fun Activity.decorateContentView(listener: OnReloadListener?, isDecorated: Boolean) {
-    findViewById<ViewGroup>(android.R.id.content).getChildAt(0).decorate(listener, isDecorated)
+  override fun Activity.decorateContentView(listener: OnReloadListener?, decorative: Decorative?) {
+    findViewById<ViewGroup>(android.R.id.content).getChildAt(0).decorate(listener, decorative)
   }
 
-  override fun View.decorate(listener: OnReloadListener?, isDecorated: Boolean): View =
-    if (isDecorated) LoadingStateView(this, listener).also { loadingStateView = it }.decorView else this
+  override fun View.decorate(listener: OnReloadListener?, decorative: Decorative?): View =
+    if (decorative?.isDecorated != false) LoadingStateView(this, listener).also { loadingStateView = it }.decorView else this
 
   override fun registerView(vararg viewDelegates: LoadingStateView.ViewDelegate) {
     loadingStateView?.register(*viewDelegates)

loadingstateview/build.gradle

@@ -22,17 +22,14 @@ android {
         tasks.withType(Javadoc).all { enabled = false }
     }
 
-    compileOptions {
-        kotlinOptions.freeCompilerArgs += ['-module-name', "loading_state_view",]
-    }
-
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8
     }
 
     kotlinOptions {
         jvmTarget = '1.8'
+        freeCompilerArgs += ['-module-name', "loading_state_view",]
     }
 }
 

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

@@ -18,18 +18,17 @@ 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.LoadingStateImpl
+import com.dylanc.loadingstateview.LoadingStateDelegate
 import com.dylanc.loadingstateview.OnReloadListener
 
 abstract class BaseActivity(private val layoutRes: Int) : AppCompatActivity(),
-  LoadingState by LoadingStateImpl(), OnReloadListener {
-
-  open val isDecorated = true
+  LoadingState by LoadingStateDelegate(), OnReloadListener, Decorative {
 
   override fun onCreate(savedInstanceState: Bundle?) {
     super.onCreate(savedInstanceState)
     setContentView(layoutRes)
-    decorateContentView(this, isDecorated)
+    decorateContentView(this, this)
   }
 }

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

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

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

@@ -22,22 +22,34 @@ 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.LoadingStateImpl
+import com.dylanc.loadingstateview.LoadingStateDelegate
 import com.dylanc.loadingstateview.OnReloadListener
 import com.dylanc.viewbinding.base.ViewBindingUtil
 
 abstract class BaseBindingFragment<VB : ViewBinding> : Fragment(),
-  LoadingState by LoadingStateImpl(), OnReloadListener {
+  LoadingState by LoadingStateDelegate(), OnReloadListener, Decorative {
 
-  lateinit var binding: VB private set
+  private var _binding: VB? = null
+  val binding get() = _binding!!
 
-  open val contentView get() = binding.root
+  open val contentView: View? get() = null
 
-  open val isDecorated = true
+  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 onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
-    binding = ViewBindingUtil.inflateWithGeneric(this, inflater, container, false)
-    return contentView.decorate(this, isDecorated)
+  override fun onDestroyView() {
+    super.onDestroyView()
+    _binding = null
   }
 }

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

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

sample-kotlin/src/main/java/com/dylanc/loadingstateview/sample/kotlin/ui/MainActivity.kt

@@ -20,6 +20,7 @@ import android.graphics.Color
 import android.os.Bundle
 import android.os.Handler
 import android.os.Looper
+import android.view.View
 import android.widget.Toast
 import com.dylanc.loadingstateview.NavBtnType
 import com.dylanc.loadingstateview.sample.kotlin.R
@@ -39,13 +40,6 @@ class MainActivity : BaseBindingActivity<ActivityMainBinding>() {
       }
     }
     showErrorView()
-    setHeaders(
-      ToolbarViewDelegate("title") {
-        rightIcon(R.drawable.ic_error){
-
-        }
-      }
-    )
   }
 
   override fun onReload() {
@@ -54,4 +48,6 @@ class MainActivity : BaseBindingActivity<ActivityMainBinding>() {
       showContentView()
     }, 2000)
   }
+
+  override val isDecorated = false
 }