Merge remote-tracking branch 'origin/master'

Author: DylanCaiCoding

README.md

@@ -4,7 +4,7 @@ English | [中文](README_ZH_CN.md)
 
 [![](https://www.jitpack.io/v/DylanCaiCoding/LoadingHelper.svg)](https://www.jitpack.io/#DylanCaiCoding/LoadingHelper) [![](https://img.shields.io/badge/License-Apache--2.0-blue.svg)](https://github.com/DylanCaiCoding/LoadingHelper/blob/master/LICENSE)
 
-`LoadingHelper` is a highly expandable Android library for showing loading status view on the low-coupling way, it is implemented with a Kotlin code of more than 200 lines without comment statement . it not only **shows different view like loading, content, error, empty or customized view** when loading network data, but also **manages title bar.**
+`LoadingHelper` is a highly expandable Android library for showing loading status view on the low-coupling way, it is implemented with a Kotlin code of less than 300 lines without comment statement . it not only **shows different view like loading, content, error, empty or customized view** when loading network data, but also **manages title bar.**
 
 ## Feature
 
@@ -15,7 +15,6 @@ English | [中文](README_ZH_CN.md)
 - Support for set reload event.
 - Support for update views anytime.
 - Support for use with most third-party libraries.
-- Support for preprocessing the content view.
 
 ## Demo
 
@@ -48,7 +47,7 @@ Add dependencies in your module `build.gradle` :
 
 ```
 dependencies {
-  implementation 'com.github.DylanCaiCoding:LoadingHelper:2.2.0'
+  implementation 'com.github.DylanCaiCoding:LoadingHelper:2.3.0'
 }
 ```
 
@@ -129,9 +128,7 @@ If you want to add an ordinary title bar above the content.
 Similar to the previous usage, create a class extends `LoadingHelper.Adapter<VH extends ViewHolder>`  and set header.
 
 ```java
-loadingHelper.register(ViewType.TITLE, new TitleAdapter("title"));
-loadingHelper.register(VIEW_TYPE_SEARCH, new SearchHeaderAdapter(onSearchListener));
-loadingHelper.setDecorHeader(ViewType.TITLE, VIEW_TYPE_SEARCH);
+loadingHelper.setDecorHeader(new TitleAdapter("title"), new SearchHeaderAdapter(onSearchListener));
 ```
 
 If you want to add an special title bar with linkage effect.
@@ -160,29 +157,10 @@ Then set it up.
 loadingHelper.setDecorAdapter(new ScrollDecorAdapter());
 ```
 
-#### Preprocessing the content view
+## Author's other libraries
 
-Create a adapter extends `LoadingHelper.ContentAdapter<VH extends ViewHolder>`.
-
-```java
-public class CommonContentAdapter extends LoadingHelper.ContentAdapter<LoadingHelper.ViewHolder> {
-  @Override
-  public LoadingHelper.ViewHolder onCreateViewHolder(@NonNull View contentView) {
-    return new LoadingHelper.ViewHolder(contentView);
-  }
-
-  @Override
-  public void onBindViewHolder(@NonNull LoadingHelper.ViewHolder holder) {
-	View contentView = holder.getRootView();
-  }
-}
-```
-
-Create a `LoadingHelper` with  the `ContentAdapter`.
-
-```java
-LoadingHelper loadingHelper = new LoadingHelper(this, new CommonContentAdapter());
-```
+- [LoadingHelper](https://github.com/DylanCaiCoding/LoadingHelper), a highly expandable Android library for decoupling the code of toolbar or loading status view.
+- [ViewBindingKTX](https://github.com/DylanCaiCoding/ViewBindingKTX), the most comprehensive utils of ViewBinding.
 
 ## Thanks
 

README_ZH_CN.md

@@ -4,7 +4,7 @@
 
 [![](https://www.jitpack.io/v/DylanCaiCoding/LoadingHelper.svg)](https://www.jitpack.io/#DylanCaiCoding/LoadingHelper) [![License](https://img.shields.io/badge/License-Apache--2.0-blue.svg)](https://github.com/DylanCaiCoding/LoadingHelper/blob/master/LICENSE)
 
-`LoadingHelper` 是一个深度解耦加载界面和标题栏的工具，只用了一个 Kotlin 文件实现，不算上注释只有 200 多行代码。不仅能在请求网络数据时**显示加载中、加载成功、加载失败、无数据的视图或自定义视图**，还可以**对标题栏进行管理**。
+`LoadingHelper` 是一个深度解耦加载界面和标题栏的工具，只用了一个 Kotlin 文件实现，不算上注释少于 300 行代码。不仅能在请求网络数据时**显示加载中、加载成功、加载失败、无数据的视图或自定义视图**，还可以**对标题栏进行管理**。
 
 详细的标题栏用法可以查看这篇文章[《史上耦合度最低的添加标题栏方式》](https://juejin.im/post/5ef01e22e51d4573eb40dab1)。
 
@@ -15,7 +15,6 @@
 - 可设置重新请求数据的事件
 - 可动态更新视图样式
 - 可结合绝大部分第三方控件使用
-- 可对内容进行预处理
 
 ## 示例
 
@@ -53,7 +52,7 @@ allprojects {
 
 ```
 dependencies {
-  implementation 'com.github.DylanCaiCoding:LoadingHelper:2.2.0'
+  implementation 'com.github.DylanCaiCoding:LoadingHelper:2.3.0'
 }
 ```
 
@@ -124,9 +123,7 @@ errorAdapter.notifyDataSetChanged();
 和前面的用法类似，先创建一个继承  `LoadingHelper.Adapter<VH extends ViewHolder>` 的标题栏适配器，然后就能在内容的上方添加标题栏了，可以添加多个头部。
 
 ```java
-loadingHelper.register(ViewType.TITLE, new TitleAdapter("标题名"));
-loadingHelper.register(VIEW_TYPE_SEARCH, new SearchHeaderAdapter(onSearchListener));
-loadingHelper.setDecorHeader(ViewType.TITLE, VIEW_TYPE_SEARCH);
+loadingHelper.setDecorHeader(new TitleAdapter("标题名"), new SearchHeaderAdapter(onSearchListener));
 ```
 
 如果是**特殊的标题栏**，比如有联动效果，就不能直接使用上面的方式了。这时我们要给内容增加个装饰的容器。
@@ -202,29 +199,10 @@ loadingHelper.setDecorAdapter(new ScrollDecorAdapter());
 
 上述的两种使用方式都是可以进行多次设置，不过每次设置会把上一次设置的样式给替换掉。
 
-#### 预处理内容视图
+## 作者其它的库
 
-创建一个适配器继承 `LoadingHelper.ContentAdapter<VH extends ViewHolder>`。如果想要使用 Activity 对象，可以在构造方法传入或者通过 contentView 获得。
-
-```java
-public class CommonContentAdapter extends LoadingHelper.ContentAdapter<LoadingHelper.ViewHolder> {
-  @Override
-  public LoadingHelper.ViewHolder onCreateViewHolder(@NonNull View contentView) {
-    return new LoadingHelper.ViewHolder(contentView);
-  }
-
-  @Override
-  public void onBindViewHolder(@NonNull LoadingHelper.ViewHolder holder) {
-    View contentView = holder.getRootView();
-  }
-}
-```
-
-在创建 `LoadingHelper` 对象时传入 `ContentAdapter` 对象，就会立即对内容视图进行处理。
-
-```java
-loadingHelper= new LoadingHelper(this, new CommonContentAdapter());
-```
+- [ViewBindingKTX](https://github.com/DylanCaiCoding/ViewBindingKTX) —— 最全面的 ViewBinding 工具
+- [ActivityResultLauncher](https://github.com/DylanCaiCoding/ActivityResultLauncher) —— 完美替代 `startActivityForResult()`
 
 ## 感谢
 

build.gradle

@@ -1,6 +1,6 @@
 
 buildscript {
-    ext.kotlin_version = '1.4.32'
+    ext.kotlin_version = '1.5.20'
     repositories {
         google()
         jcenter()