Optimize code

Author: DylanCaiCoding

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

@@ -149,4 +149,4 @@ class LoadingStateImpl : LoadingState {
     }.apply {
       config = ToolbarConfig(title, navBtnType).apply { block?.invoke(this) }
     }
-}
+}

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

@@ -20,85 +20,55 @@ package com.dylanc.loadingstateview
 
 import android.app.Activity
 import android.view.View
-import androidx.annotation.ColorInt
 import androidx.annotation.DrawableRes
+import kotlin.properties.ReadWriteProperty
+import kotlin.reflect.KProperty
 
 enum class NavBtnType {
   ICON, TEXT, ICON_TEXT, NONE
 }
 
-open class ToolbarConfig(
+class ToolbarConfig(
   var title: String? = null,
   var navBtnType: NavBtnType = NavBtnType.ICON,
+  @DrawableRes var navIcon: Int? = null,
   var navText: String? = null,
-  @DrawableRes var navIcon: Int = ToolbarUI.navIcon,
-  var navClickListener: View.OnClickListener = View.OnClickListener {
-    if (it.context is Activity) (it.context as Activity).finish()
+  var onNavClickListener: View.OnClickListener = View.OnClickListener {
+    val context = it.context
+    if (context is Activity) context.finish()
   },
-  @DrawableRes var rightIcon: Int = -1,
+  @DrawableRes var rightIcon: Int? = null,
   var rightText: String? = null,
-  var rightClickListener: View.OnClickListener? = null,
-  @DrawableRes var rightSecondIcon: Int = -1,
-  var rightSecondClickListener: View.OnClickListener? = null,
-  var height: Float = ToolbarUI.height,
-  var titleTextSize: Float = ToolbarUI.titleTextSize,
-  var rightTextSize: Float = ToolbarUI.rightTextSize,
-  var rightSecondTextSize: Float = ToolbarUI.rightSecondTextSize,
-  @ColorInt var titleTextColor: Int = ToolbarUI.titleTextColor,
-  @ColorInt var navTextColor: Int = ToolbarUI.navTextColor,
-  @ColorInt var rightTextColor: Int = ToolbarUI.rightTextColor,
-  @ColorInt var backgroundColor: Int = ToolbarUI.backgroundColor,
-  var navIconSize: Float = ToolbarUI.navIconSize,
-  var rightIconSize: Float = ToolbarUI.rightIconSize,
-  var rightSecondIconSize: Float = ToolbarUI.rightSecondIconSize,
+  var onRightClickListener: View.OnClickListener? = null,
+  val extras: HashMap<String, Any?> = HashMap()
 )
 
-fun ToolbarConfig.navText(text: String, listener: View.OnClickListener) {
-  navText = text
-  navClickListener = listener
-}
-
 fun ToolbarConfig.navIcon(@DrawableRes icon: Int, listener: View.OnClickListener) {
   navIcon = icon
-  navClickListener = listener
+  onNavClickListener = listener
+}
+
+fun ToolbarConfig.navText(text: String, listener: View.OnClickListener) {
+  navText = text
+  onNavClickListener = listener
 }
 
 fun ToolbarConfig.rightIcon(@DrawableRes icon: Int, listener: View.OnClickListener) {
   rightIcon = icon
-  rightClickListener = listener
+  onRightClickListener = listener
 }
 
 fun ToolbarConfig.rightText(text: String, listener: View.OnClickListener) {
   rightText = text
-  rightClickListener = listener
+  onRightClickListener = listener
 }
 
-fun ToolbarConfig.rightSecondIcon(@DrawableRes icon: Int, listener: View.OnClickListener) {
-  rightSecondIcon = icon
-  rightSecondClickListener = listener
-}
-
-object ToolbarUI {
-  var height = -1f
-  var titleTextSize = -1f
-  var rightTextSize = -1f
-  var rightSecondTextSize = -1f
-
-  @ColorInt
-  var titleTextColor = -1
-
-  @ColorInt
-  var navTextColor = -1
+fun <T> toolbarExtras() = object : ReadWriteProperty<ToolbarConfig, T?> {
+  @Suppress("UNCHECKED_CAST")
+  override fun getValue(thisRef: ToolbarConfig, property: KProperty<*>): T? =
+    thisRef.extras[property.name] as? T
 
-  @ColorInt
-  var rightTextColor = -1
-
-  @ColorInt
-  var backgroundColor = -1
-
-  @DrawableRes
-  var navIcon: Int = -1
-  var navIconSize = -1f
-  var rightIconSize = -1f
-  var rightSecondIconSize = -1f
-}
+  override fun setValue(thisRef: ToolbarConfig, property: KProperty<*>, value: T?) {
+    thisRef.extras[property.name] = value
+  }
+}

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

@@ -14,8 +14,6 @@
  * limitations under the License.
  */
 
-@file:Suppress("unused")
-
 package com.dylanc.loadingstateview
 
 import android.view.LayoutInflater
@@ -31,4 +29,4 @@ abstract class ToolbarViewDelegate : LoadingStateView.ViewDelegate(ViewType.TITL
   abstract fun onCreateToolbar(inflater: LayoutInflater, parent: ViewGroup): View
 
   abstract fun bind(config: ToolbarConfig)
-}
+}

loadingstateview-toolbar/src/main/java/com/dylanc/loadingstateview/toolbar/SimpleToolbarViewDelegate.kt

@@ -36,13 +36,9 @@ android {
 
 dependencies {
     implementation project(':loadingstateview-ktx')
-    implementation project(':loadingstateview-toolbar')
     implementation 'androidx.appcompat:appcompat:1.3.1'
-    implementation 'androidx.recyclerview:recyclerview:1.2.1'
-    implementation 'androidx.cardview:cardview:1.0.0'
     implementation 'com.google.android.material:material:1.4.0'
     implementation 'androidx.constraintlayout:constraintlayout:2.1.0'
-    implementation 'com.github.bumptech.glide:glide:4.12.0'
     implementation 'com.github.DylanCaiCoding.ViewBindingKTX:viewbinding-base:2.0.5'
     testImplementation 'junit:junit:4.13.2'
     androidTestImplementation 'androidx.test.ext:junit:1.1.3'

sample-kotlin/build.gradle

@@ -4,14 +4,14 @@ import android.app.Application
 import com.dylanc.loadingstateview.LoadingStateView
 import com.dylanc.loadingstateview.sample.kotlin.delegate.ErrorViewDelegate
 import com.dylanc.loadingstateview.sample.kotlin.delegate.LoadingViewDelegate
-import com.dylanc.loadingstateview.toolbar.SimpleToolbarViewDelegate
+import com.dylanc.loadingstateview.sample.kotlin.delegate.DefaultToolbarViewDelegate
 
 class App : Application() {
 
   override fun onCreate() {
     super.onCreate()
     LoadingStateView.setViewDelegatePool {
-      register(SimpleToolbarViewDelegate(), LoadingViewDelegate(), ErrorViewDelegate())
+      register(DefaultToolbarViewDelegate(), LoadingViewDelegate(), ErrorViewDelegate())
     }
   }
 }

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

@@ -25,11 +25,11 @@ import com.dylanc.loadingstateview.OnReloadListener
 abstract class BaseActivity(private val layoutRes: Int) : AppCompatActivity(),
   LoadingState by LoadingStateImpl(), OnReloadListener {
 
+  open val isDecorated = true
+
   override fun onCreate(savedInstanceState: Bundle?) {
     super.onCreate(savedInstanceState)
     setContentView(layoutRes)
     decorateContentView(this, isDecorated)
   }
-
-  open val isDecorated = true
 }

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

@@ -29,12 +29,14 @@ abstract class BaseBindingActivity<VB : ViewBinding> : AppCompatActivity(),
 
   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(binding.root)
-    binding.root.decorate(this, isDecorated)
+    setContentView(contentView)
+    contentView.decorate(this, isDecorated)
   }
-
-  open val isDecorated = true
 }

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

@@ -32,10 +32,12 @@ abstract class BaseBindingFragment<VB : ViewBinding> : Fragment(),
 
   lateinit var binding: VB private set
 
+  open val contentView get() = binding.root
+
+  open val isDecorated = true
+
   override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
     binding = ViewBindingUtil.inflateWithGeneric(this, inflater, container, false)
-    return binding.root.decorate(this, isDecorated)
+    return contentView.decorate(this, isDecorated)
   }
-
-  open val isDecorated = true
 }

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

@@ -28,10 +28,10 @@ import com.dylanc.loadingstateview.OnReloadListener
 abstract class BaseFragment(private val layoutRes: Int) : Fragment(),
   LoadingState by LoadingStateImpl(), OnReloadListener {
 
+  open val isDecorated = true
+
   override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
     val root = inflater.inflate(layoutRes, container, false)
     return root.decorate(this, isDecorated)
   }
-
-  open val isDecorated = true
 }