Optimize code

DylanCaiCoding · DylanCaiCoding · commit 5cf3920733c6 · 2021-09-27T00:32:59.000+08:00
diff --git a/app/src/main/java/com/dylanc/loadingstateview/sample/App.java b/app/src/main/java/com/dylanc/loadingstateview/sample/App.java
@@ -20,9 +20,9 @@
 
 import com.dylanc.loadingstateview.LoadingStateView;
 import com.dylanc.loadingstateview.ViewType;
-import com.dylanc.loadingstateview.sample.viewdelegate.EmptyViewDelegate;
-import com.dylanc.loadingstateview.sample.viewdelegate.ErrorViewDelegate;
-import com.dylanc.loadingstateview.sample.viewdelegate.LoadingViewDelegate;
+import com.dylanc.loadingstateview.sample.delegate.EmptyViewDelegate;
+import com.dylanc.loadingstateview.sample.delegate.ErrorViewDelegate;
+import com.dylanc.loadingstateview.sample.delegate.LoadingViewDelegate;
 
 import kotlin.Unit;
 
@@ -33,10 +33,10 @@ public class App extends Application {
   @Override
   public void onCreate() {
     super.onCreate();
-    LoadingStateView.setViewDelegatePool(adapterPool -> {
-      adapterPool.register(ViewType.LOADING, new LoadingViewDelegate());
-      adapterPool.register(ViewType.ERROR, new ErrorViewDelegate());
-      adapterPool.register(ViewType.EMPTY, new EmptyViewDelegate());
+    LoadingStateView.setViewDelegatePool(pool -> {
+      pool.register(ViewType.LOADING, new LoadingViewDelegate());
+      pool.register(ViewType.ERROR, new ErrorViewDelegate());
+      pool.register(ViewType.EMPTY, new EmptyViewDelegate());
       return Unit.INSTANCE;
     });
   }
diff --git a/app/src/main/java/com/dylanc/loadingstateview/sample/base/BaseActivity.java b/app/src/main/java/com/dylanc/loadingstateview/sample/base/BaseActivity.java
@@ -20,8 +20,8 @@
 import androidx.appcompat.app.AppCompatActivity;
 
 import com.dylanc.loadingstateview.LoadingStateView;
-import com.dylanc.loadingstateview.sample.viewdelegate.NavIconType;
-import com.dylanc.loadingstateview.sample.viewdelegate.ToolbarViewDelegate;
+import com.dylanc.loadingstateview.sample.delegate.NavIconType;
+import com.dylanc.loadingstateview.sample.delegate.ToolbarViewDelegate;
 
 /**
  * 这是耦合度较低的封装方式，没有任何抽象方法，可以很方便地将基类里的代码拷贝到其它项目的基类里使用。
diff --git a/app/src/main/java/com/dylanc/loadingstateview/sample/delegate/BottomEditorDecorViewDelegate.java b/app/src/main/java/com/dylanc/loadingstateview/sample/delegate/BottomEditorDecorViewDelegate.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.dylanc.loadingstateview.sample.viewdelegate;
+package com.dylanc.loadingstateview.sample.delegate;
 
 import android.annotation.SuppressLint;
 import android.view.LayoutInflater;
diff --git a/app/src/main/java/com/dylanc/loadingstateview/sample/delegate/CoolLoadingViewDelegate.java b/app/src/main/java/com/dylanc/loadingstateview/sample/delegate/CoolLoadingViewDelegate.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.dylanc.loadingstateview.sample.viewdelegate;
+package com.dylanc.loadingstateview.sample.delegate;
 
 import androidx.annotation.NonNull;
 import android.view.LayoutInflater;
diff --git a/app/src/main/java/com/dylanc/loadingstateview/sample/delegate/CustomHeaderViewDelegate.java b/app/src/main/java/com/dylanc/loadingstateview/sample/delegate/CustomHeaderViewDelegate.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.dylanc.loadingstateview.sample.viewdelegate;
+package com.dylanc.loadingstateview.sample.delegate;
 
 import android.app.Activity;
 import android.os.Build;
diff --git a/app/src/main/java/com/dylanc/loadingstateview/sample/delegate/EmptyViewDelegate.java b/app/src/main/java/com/dylanc/loadingstateview/sample/delegate/EmptyViewDelegate.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.dylanc.loadingstateview.sample.viewdelegate;
+package com.dylanc.loadingstateview.sample.delegate;
 
 import androidx.annotation.NonNull;
 import android.view.LayoutInflater;
diff --git a/app/src/main/java/com/dylanc/loadingstateview/sample/delegate/ErrorViewDelegate.java b/app/src/main/java/com/dylanc/loadingstateview/sample/delegate/ErrorViewDelegate.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.dylanc.loadingstateview.sample.viewdelegate;
+package com.dylanc.loadingstateview.sample.delegate;
 
 import androidx.annotation.NonNull;
 import android.view.LayoutInflater;
diff --git a/app/src/main/java/com/dylanc/loadingstateview/sample/delegate/LoadingViewDelegate.java b/app/src/main/java/com/dylanc/loadingstateview/sample/delegate/LoadingViewDelegate.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.dylanc.loadingstateview.sample.viewdelegate;
+package com.dylanc.loadingstateview.sample.delegate;
 
 import androidx.annotation.NonNull;
 import android.view.LayoutInflater;
diff --git a/app/src/main/java/com/dylanc/loadingstateview/sample/delegate/NavIconType.java b/app/src/main/java/com/dylanc/loadingstateview/sample/delegate/NavIconType.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.dylanc.loadingstateview.sample.viewdelegate;
+package com.dylanc.loadingstateview.sample.delegate;
 
 /**
  * @author Dylan Cai
diff --git a/app/src/main/java/com/dylanc/loadingstateview/sample/delegate/NothingViewDelegate.java b/app/src/main/java/com/dylanc/loadingstateview/sample/delegate/NothingViewDelegate.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.dylanc.loadingstateview.sample.viewdelegate;
+package com.dylanc.loadingstateview.sample.delegate;
 
 import androidx.annotation.NonNull;
 import android.view.LayoutInflater;
diff --git a/app/src/main/java/com/dylanc/loadingstateview/sample/delegate/PlaceholderViewDelegate.java b/app/src/main/java/com/dylanc/loadingstateview/sample/delegate/PlaceholderViewDelegate.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.dylanc.loadingstateview.sample.viewdelegate;
+package com.dylanc.loadingstateview.sample.delegate;
 
 import androidx.annotation.NonNull;
 import android.view.LayoutInflater;
diff --git a/app/src/main/java/com/dylanc/loadingstateview/sample/delegate/ScrollingDecorViewDelegate.java b/app/src/main/java/com/dylanc/loadingstateview/sample/delegate/ScrollingDecorViewDelegate.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.dylanc.loadingstateview.sample.viewdelegate;
+package com.dylanc.loadingstateview.sample.delegate;
 
 import android.annotation.SuppressLint;
 import android.app.Activity;
diff --git a/app/src/main/java/com/dylanc/loadingstateview/sample/delegate/SearchHeaderViewDelegate.java b/app/src/main/java/com/dylanc/loadingstateview/sample/delegate/SearchHeaderViewDelegate.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.dylanc.loadingstateview.sample.viewdelegate;
+package com.dylanc.loadingstateview.sample.delegate;
 
 import android.view.LayoutInflater;
 import android.view.View;
diff --git a/app/src/main/java/com/dylanc/loadingstateview/sample/delegate/TimeoutViewDelegate.java b/app/src/main/java/com/dylanc/loadingstateview/sample/delegate/TimeoutViewDelegate.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.dylanc.loadingstateview.sample.viewdelegate;
+package com.dylanc.loadingstateview.sample.delegate;
 
 import androidx.annotation.NonNull;
 import android.view.LayoutInflater;
diff --git a/app/src/main/java/com/dylanc/loadingstateview/sample/delegate/ToolbarViewDelegate.java b/app/src/main/java/com/dylanc/loadingstateview/sample/delegate/ToolbarViewDelegate.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.dylanc.loadingstateview.sample.viewdelegate;
+package com.dylanc.loadingstateview.sample.delegate;
 
 import android.app.Activity;
 import android.os.Build;
diff --git a/app/src/main/java/com/dylanc/loadingstateview/sample/ui/ActErrorActivity.java b/app/src/main/java/com/dylanc/loadingstateview/sample/ui/ActErrorActivity.java
@@ -23,7 +23,7 @@
 
 import com.dylanc.loadingstateview.LoadingStateView;
 import com.dylanc.loadingstateview.sample.R;
-import com.dylanc.loadingstateview.sample.viewdelegate.NavIconType;
+import com.dylanc.loadingstateview.sample.delegate.NavIconType;
 import com.dylanc.loadingstateview.sample.animation.FadeAnimation;
 import com.dylanc.loadingstateview.sample.utils.HttpUtils;
 import com.dylanc.loadingstateview.sample.utils.ToolbarUtils;
diff --git a/app/src/main/java/com/dylanc/loadingstateview/sample/ui/BottomEditorActivity.java b/app/src/main/java/com/dylanc/loadingstateview/sample/ui/BottomEditorActivity.java
@@ -24,9 +24,9 @@
 import com.dylanc.loadingstateview.LoadingStateView;
 import com.dylanc.loadingstateview.ViewType;
 import com.dylanc.loadingstateview.sample.R;
-import com.dylanc.loadingstateview.sample.viewdelegate.BottomEditorDecorViewDelegate;
-import com.dylanc.loadingstateview.sample.viewdelegate.NothingViewDelegate;
-import com.dylanc.loadingstateview.sample.viewdelegate.NavIconType;
+import com.dylanc.loadingstateview.sample.delegate.BottomEditorDecorViewDelegate;
+import com.dylanc.loadingstateview.sample.delegate.NothingViewDelegate;
+import com.dylanc.loadingstateview.sample.delegate.NavIconType;
 import com.dylanc.loadingstateview.sample.utils.HttpUtils;
 import com.dylanc.loadingstateview.sample.utils.ToolbarUtils;
 
diff --git a/app/src/main/java/com/dylanc/loadingstateview/sample/ui/FragmentEmptyActivity.java b/app/src/main/java/com/dylanc/loadingstateview/sample/ui/FragmentEmptyActivity.java
@@ -23,7 +23,7 @@
 import androidx.fragment.app.FragmentTransaction;
 
 import com.dylanc.loadingstateview.sample.R;
-import com.dylanc.loadingstateview.sample.viewdelegate.NavIconType;
+import com.dylanc.loadingstateview.sample.delegate.NavIconType;
 import com.dylanc.loadingstateview.sample.ui.fragment.EmptyFragment;
 import com.dylanc.loadingstateview.sample.utils.ToolbarUtils;
 
diff --git a/app/src/main/java/com/dylanc/loadingstateview/sample/ui/MainActivity.java b/app/src/main/java/com/dylanc/loadingstateview/sample/ui/MainActivity.java
@@ -26,7 +26,7 @@
 import androidx.annotation.Nullable;
 
 import com.dylanc.loadingstateview.sample.R;
-import com.dylanc.loadingstateview.sample.viewdelegate.NavIconType;
+import com.dylanc.loadingstateview.sample.delegate.NavIconType;
 import com.dylanc.loadingstateview.sample.base.BaseActivity;
 
 /**
diff --git a/app/src/main/java/com/dylanc/loadingstateview/sample/ui/MultipleHeaderActivity.java b/app/src/main/java/com/dylanc/loadingstateview/sample/ui/MultipleHeaderActivity.java
@@ -25,10 +25,10 @@
 import com.dylanc.loadingstateview.LoadingStateView;
 import com.dylanc.loadingstateview.ViewType;
 import com.dylanc.loadingstateview.sample.R;
-import com.dylanc.loadingstateview.sample.viewdelegate.NothingViewDelegate;
-import com.dylanc.loadingstateview.sample.viewdelegate.SearchHeaderViewDelegate;
-import com.dylanc.loadingstateview.sample.viewdelegate.ToolbarViewDelegate;
-import com.dylanc.loadingstateview.sample.viewdelegate.NavIconType;
+import com.dylanc.loadingstateview.sample.delegate.NothingViewDelegate;
+import com.dylanc.loadingstateview.sample.delegate.SearchHeaderViewDelegate;
+import com.dylanc.loadingstateview.sample.delegate.ToolbarViewDelegate;
+import com.dylanc.loadingstateview.sample.delegate.NavIconType;
 import com.dylanc.loadingstateview.sample.utils.HttpUtils;
 
 /**
diff --git a/app/src/main/java/com/dylanc/loadingstateview/sample/ui/RecyclerViewActivity.java b/app/src/main/java/com/dylanc/loadingstateview/sample/ui/RecyclerViewActivity.java
@@ -37,8 +37,8 @@
 import com.dylanc.loadingstateview.LoadingStateView;
 import com.dylanc.loadingstateview.ViewType;
 import com.dylanc.loadingstateview.sample.R;
-import com.dylanc.loadingstateview.sample.viewdelegate.CoolLoadingViewDelegate;
-import com.dylanc.loadingstateview.sample.viewdelegate.NavIconType;
+import com.dylanc.loadingstateview.sample.delegate.CoolLoadingViewDelegate;
+import com.dylanc.loadingstateview.sample.delegate.NavIconType;
 import com.dylanc.loadingstateview.sample.utils.HttpUtils;
 import com.dylanc.loadingstateview.sample.utils.ToolbarUtils;
 
diff --git a/app/src/main/java/com/dylanc/loadingstateview/sample/ui/ScrollingToolbarActivity.java b/app/src/main/java/com/dylanc/loadingstateview/sample/ui/ScrollingToolbarActivity.java
@@ -25,7 +25,7 @@
 import com.dylanc.loadingstateview.LoadingStateView;
 import com.dylanc.loadingstateview.ViewType;
 import com.dylanc.loadingstateview.sample.R;
-import com.dylanc.loadingstateview.sample.viewdelegate.LoadingViewDelegate;
+import com.dylanc.loadingstateview.sample.delegate.LoadingViewDelegate;
 import com.dylanc.loadingstateview.sample.utils.HttpUtils;
 import com.dylanc.loadingstateview.sample.utils.ToolbarUtils;
 
diff --git a/app/src/main/java/com/dylanc/loadingstateview/sample/ui/ViewPagerActivity.java b/app/src/main/java/com/dylanc/loadingstateview/sample/ui/ViewPagerActivity.java
@@ -27,7 +27,7 @@
 import androidx.viewpager.widget.ViewPager;
 
 import com.dylanc.loadingstateview.sample.R;
-import com.dylanc.loadingstateview.sample.viewdelegate.NavIconType;
+import com.dylanc.loadingstateview.sample.delegate.NavIconType;
 import com.dylanc.loadingstateview.sample.ui.fragment.TimeoutFragment;
 import com.dylanc.loadingstateview.sample.utils.ToolbarUtils;
 import com.google.android.material.tabs.TabLayout;
diff --git a/app/src/main/java/com/dylanc/loadingstateview/sample/ui/ViewPlaceholderActivity.java b/app/src/main/java/com/dylanc/loadingstateview/sample/ui/ViewPlaceholderActivity.java
@@ -25,8 +25,8 @@
 import com.dylanc.loadingstateview.LoadingStateView;
 import com.dylanc.loadingstateview.ViewType;
 import com.dylanc.loadingstateview.sample.R;
-import com.dylanc.loadingstateview.sample.viewdelegate.PlaceholderViewDelegate;
-import com.dylanc.loadingstateview.sample.viewdelegate.NavIconType;
+import com.dylanc.loadingstateview.sample.delegate.PlaceholderViewDelegate;
+import com.dylanc.loadingstateview.sample.delegate.NavIconType;
 import com.dylanc.loadingstateview.sample.utils.HttpUtils;
 import com.dylanc.loadingstateview.sample.utils.ToolbarUtils;
 
diff --git a/app/src/main/java/com/dylanc/loadingstateview/sample/ui/fragment/TimeoutFragment.java b/app/src/main/java/com/dylanc/loadingstateview/sample/ui/fragment/TimeoutFragment.java
@@ -26,7 +26,7 @@
 import androidx.fragment.app.Fragment;
 
 import com.dylanc.loadingstateview.LoadingStateView;
-import com.dylanc.loadingstateview.sample.viewdelegate.TimeoutViewDelegate;
+import com.dylanc.loadingstateview.sample.delegate.TimeoutViewDelegate;
 import com.dylanc.loadingstateview.sample.databinding.LayoutContentBinding;
 import com.dylanc.loadingstateview.sample.utils.HttpUtils;
 
diff --git a/app/src/main/java/com/dylanc/loadingstateview/sample/utils/ToolbarUtils.java b/app/src/main/java/com/dylanc/loadingstateview/sample/utils/ToolbarUtils.java
@@ -22,10 +22,10 @@
 
 import com.dylanc.loadingstateview.LoadingStateView;
 import com.dylanc.loadingstateview.ViewType;
-import com.dylanc.loadingstateview.sample.viewdelegate.CustomHeaderViewDelegate;
-import com.dylanc.loadingstateview.sample.viewdelegate.ScrollingDecorViewDelegate;
-import com.dylanc.loadingstateview.sample.viewdelegate.ToolbarViewDelegate;
-import com.dylanc.loadingstateview.sample.viewdelegate.NavIconType;
+import com.dylanc.loadingstateview.sample.delegate.CustomHeaderViewDelegate;
+import com.dylanc.loadingstateview.sample.delegate.ScrollingDecorViewDelegate;
+import com.dylanc.loadingstateview.sample.delegate.ToolbarViewDelegate;
+import com.dylanc.loadingstateview.sample.delegate.NavIconType;
 
 import kotlin.jvm.functions.Function1;
 
diff --git a/build.gradle b/build.gradle
@@ -1,4 +1,5 @@
 
+
 buildscript {
     ext.kotlin_version = '1.5.20'
     repositories {
diff --git a/library/src/main/java/com/dylanc/loadingstateview/LoadingStateView.kt b/library/src/main/java/com/dylanc/loadingstateview/LoadingStateView.kt
