Optimize usage

Author: DylanCaiCoding

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

@@ -23,24 +23,46 @@ import androidx.annotation.StringRes
 import androidx.fragment.app.Fragment
 
 interface LoadingState {
-  fun Activity.decorateContentView(listener: OnReloadListener, isDecorated: Boolean = true)
-  fun View.decorate(listener: OnReloadListener, isDecorated: Boolean = true): View
+
+  fun Activity.decorateContentView(listener: OnReloadListener, isDecorated: Boolean)
+
+  fun View.decorate(listener: OnReloadListener, isDecorated: Boolean): View
+
   fun registerView(vararg viewDelegates: LoadingStateView.ViewDelegate)
+
   fun Activity.setToolbar(@StringRes titleId: Int, navBtnType: NavBtnType = NavBtnType.ICON, block: (ToolbarConfig.() -> Unit)? = null)
+
   fun Activity.setToolbar(title: String? = null, navBtnType: NavBtnType = NavBtnType.ICON, block: (ToolbarConfig.() -> Unit)? = null)
+
   fun Fragment.setToolbar(@StringRes titleId: Int, navBtnType: NavBtnType = NavBtnType.ICON, block: (ToolbarConfig.() -> Unit)? = null)
+
   fun Fragment.setToolbar(title: String? = null, navBtnType: NavBtnType = NavBtnType.ICON, block: (ToolbarConfig.() -> Unit)? = null)
+
   fun Activity.setHeaders(vararg delegates: LoadingStateView.ViewDelegate)
+
   fun Fragment.setHeaders(vararg delegates: LoadingStateView.ViewDelegate)
+
   fun Activity.setDecorView(delegate: LoadingStateView.DecorViewDelegate)
+
   fun Fragment.setDecorView(delegate: LoadingStateView.DecorViewDelegate)
+
   fun showLoadingView()
+
   fun showContentView()
+
   fun showErrorView()
+
   fun showEmptyView()
+
   fun showCustomView(viewType: Any)
+
   fun updateToolbar(block: ToolbarConfig.() -> Unit)
+
   fun <T : LoadingStateView.ViewDelegate> updateView(viewType: Any, block: T.() -> Unit)
+
+  fun ToolbarViewDelegate(
+    title: String? = null, navBtnType: NavBtnType = NavBtnType.ICON, block: (ToolbarConfig.() -> Unit)? = null
+  ): ToolbarViewDelegate
 }
 
 class LoadingStateImpl : LoadingState {
@@ -66,15 +88,15 @@ class LoadingStateImpl : LoadingState {
   }
 
   override fun Activity.setToolbar(title: String?, navBtnType: NavBtnType, block: (ToolbarConfig.() -> Unit)?) {
-    setHeaders(ToolbarViewDelegate(title, navBtnType, block))
+    loadingStateView?.setHeaders(ToolbarViewDelegate(title, navBtnType, block))
   }
 
   override fun Fragment.setToolbar(@StringRes titleId: Int, navBtnType: NavBtnType, block: (ToolbarConfig.() -> Unit)?) {
     setToolbar(getString(titleId), navBtnType, block)
   }
 
   override fun Fragment.setToolbar(title: String?, navBtnType: NavBtnType, block: (ToolbarConfig.() -> Unit)?) {
-    setHeaders(ToolbarViewDelegate(title, navBtnType, block))
+    loadingStateView?.setHeaders(ToolbarViewDelegate(title, navBtnType, block))
   }
 
   override fun Activity.setHeaders(vararg delegates: LoadingStateView.ViewDelegate) {
@@ -120,4 +142,11 @@ class LoadingStateImpl : LoadingState {
   override fun <T : LoadingStateView.ViewDelegate> updateView(viewType: Any, block: T.() -> Unit) {
     loadingStateView?.getViewDelegate<T>(viewType)?.apply(block)
   }
+
+  override fun ToolbarViewDelegate(title: String?, navBtnType: NavBtnType, block: (ToolbarConfig.() -> Unit)?) =
+    requireNotNull(loadingStateView?.getViewDelegate<ToolbarViewDelegate>(ViewType.TITLE)) {
+      "ToolbarViewDelegate must be registered before."
+    }.apply {
+      config = ToolbarConfig(title, navBtnType).apply { block?.invoke(this) }
+    }
 }

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

@@ -22,13 +22,6 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 
-typealias ToolbarFactory = () -> ToolbarViewDelegate
-
-lateinit var toolbarFactory: ToolbarFactory
-
-fun ToolbarViewDelegate(title: String? = null, navBtnType: NavBtnType = NavBtnType.ICON, block: (ToolbarConfig.() -> Unit)? = null) =
-  toolbarFactory().apply { config = ToolbarConfig(title, navBtnType).apply { block?.invoke(this) } }
-
 abstract class ToolbarViewDelegate : LoadingStateView.ViewDelegate(ViewType.TITLE) {
   internal lateinit var config: ToolbarConfig
 

loadingstateview/src/main/java/com/dylanc/loadingstateview/LoadingStateView.kt

@@ -248,8 +248,8 @@ class LoadingStateView @JvmOverloads constructor(
   }
 }
 
-fun interface OnReloadListener {
-  fun onReload()
+interface OnReloadListener {
+  fun onReload() = Unit
 }
 
 enum class ViewType {

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

@@ -20,6 +20,7 @@
 import androidx.appcompat.app.AppCompatActivity;
 
 import com.dylanc.loadingstateview.LoadingStateView;
+import com.dylanc.loadingstateview.OnReloadListener;
 import com.dylanc.loadingstateview.sample.java.delegate.NavIconType;
 import com.dylanc.loadingstateview.sample.java.delegate.ToolbarViewDelegate;
 
@@ -33,7 +34,7 @@
  * @author Dylan Cai
  */
 @SuppressWarnings("unused")
-public class BaseActivity extends AppCompatActivity {
+public class BaseActivity extends AppCompatActivity implements OnReloadListener {
 
   private LoadingStateView loadingStateView;
 
@@ -45,7 +46,7 @@ public void setContentView(int layoutResID) {
   public void setContentView(int layoutResID, @IdRes int contentViewId) {
     super.setContentView(layoutResID);
     if (contentViewId == 0) {
-      loadingStateView = new LoadingStateView(this, this::onReload);
+      loadingStateView = new LoadingStateView(this, this);
     } else {
       loadingStateView = new LoadingStateView(findViewById(contentViewId));
     }
@@ -86,6 +87,7 @@ public void showCustomView(Object viewType) {
     loadingStateView.showView(viewType);
   }
 
-  protected void onReload() {
+  @Override
+  public void onReload() {
   }
 }

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

@@ -38,7 +38,7 @@ public class MainActivity extends BaseActivity {
   protected void onCreate(@Nullable Bundle savedInstanceState) {
     super.onCreate(savedInstanceState);
     setContentView(R.layout.activity_main);
-    setToolbar("LoadingHelper", NavIconType.NONE, R.menu.menu_about);
+    setToolbar(getString(R.string.app_name), NavIconType.NONE, R.menu.menu_about);
   }
 
   @Override

sample-kotlin/build.gradle

@@ -43,6 +43,7 @@ dependencies {
     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'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'

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

@@ -5,15 +5,13 @@ 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.toolbarFactory
 
 class App : Application() {
 
   override fun onCreate() {
     super.onCreate()
     LoadingStateView.setViewDelegatePool {
-      register(LoadingViewDelegate(), ErrorViewDelegate())
+      register(SimpleToolbarViewDelegate(), LoadingViewDelegate(), ErrorViewDelegate())
     }
-    toolbarFactory = { SimpleToolbarViewDelegate() }
   }
 }

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

@@ -1,3 +1,19 @@
+/*
+ * Copyright (c) 2019. Dylan Cai
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package com.dylanc.loadingstateview.sample.kotlin.base
 
 import android.os.Bundle
@@ -6,9 +22,8 @@ import com.dylanc.loadingstateview.LoadingState
 import com.dylanc.loadingstateview.LoadingStateImpl
 import com.dylanc.loadingstateview.OnReloadListener
 
-abstract class BaseActivity : AppCompatActivity(), LoadingState by LoadingStateImpl(), OnReloadListener {
-
-  abstract val layoutRes: Int
+abstract class BaseActivity(private val layoutRes: Int) : AppCompatActivity(),
+  LoadingState by LoadingStateImpl(), OnReloadListener {
 
   override fun onCreate(savedInstanceState: Bundle?) {
     super.onCreate(savedInstanceState)
@@ -17,6 +32,4 @@ abstract class BaseActivity : AppCompatActivity(), LoadingState by LoadingStateI
   }
 
   open val isDecorated = true
-
-  override fun onReload() = Unit
 }

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

@@ -0,0 +1,40 @@
+/*
+ * Copyright (c) 2019. Dylan Cai
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.dylanc.loadingstateview.sample.kotlin.base
+
+import android.os.Bundle
+import androidx.appcompat.app.AppCompatActivity
+import androidx.viewbinding.ViewBinding
+import com.dylanc.loadingstateview.LoadingState
+import com.dylanc.loadingstateview.LoadingStateImpl
+import com.dylanc.loadingstateview.OnReloadListener
+import com.dylanc.viewbinding.base.ViewBindingUtil
+
+abstract class BaseBindingActivity<VB : ViewBinding> : AppCompatActivity(),
+  LoadingState by LoadingStateImpl(), OnReloadListener {
+
+  lateinit var binding: VB private set
+
+  override fun onCreate(savedInstanceState: Bundle?) {
+    super.onCreate(savedInstanceState)
+    binding = ViewBindingUtil.inflateWithGeneric(this, layoutInflater)
+    setContentView(binding.root)
+    binding.root.decorate(this, isDecorated)
+  }
+
+  open val isDecorated = true
+}

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

@@ -0,0 +1,41 @@
+/*
+ * Copyright (c) 2019. Dylan Cai
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+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.LoadingState
+import com.dylanc.loadingstateview.LoadingStateImpl
+import com.dylanc.loadingstateview.OnReloadListener
+import com.dylanc.viewbinding.base.ViewBindingUtil
+
+abstract class BaseBindingFragment<VB : ViewBinding> : Fragment(),
+  LoadingState by LoadingStateImpl(), OnReloadListener {
+
+  lateinit var binding: VB private set
+
+  override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
+    binding = ViewBindingUtil.inflateWithGeneric(this, inflater, container, false)
+    return binding.root.decorate(this, isDecorated)
+  }
+
+  open val isDecorated = true
+}