Merge pull request #23 from DylanCaiCoding/3.0

3.0

Author: DylanCaiCoding

app/build.gradle

@@ -1,12 +1,11 @@
 apply plugin: 'com.android.application'
 apply plugin: 'kotlin-android'
-apply plugin: 'kotlin-android-extensions'
 
 android {
     compileSdkVersion 30
 
     defaultConfig {
-        applicationId "com.dylanc.loadinghelper.sample"
+        applicationId "com.dylanc.loadingstateview.sample"
         minSdkVersion 21
         targetSdkVersion 30
         versionCode 2
@@ -34,13 +33,13 @@ android {
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
     implementation project(':library')
-    implementation 'androidx.appcompat:appcompat:1.2.0'
-    implementation 'androidx.recyclerview:recyclerview:1.2.0'
+    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.3.0'
-    implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
+    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'
     testImplementation 'junit:junit:4.13.2'
-    androidTestImplementation 'androidx.test.ext:junit:1.1.2'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
+    androidTestImplementation 'androidx.test.ext:junit:1.1.3'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
 }

app/proguard-rules.pro

@@ -20,4 +20,4 @@
 # hide the original source file name.
 #-renamesourcefileattribute SourceFile
 
--keep public class com.dylanc.loadinghelper.sample.widget.**{*;}
+-keep public class com.dylanc.loadingstateview.sample.widget.**{*;}

app/src/androidTest/java/com/dylanc/loadinghelper/sample/ExampleInstrumentedTest.kt renamed to app/src/androidTest/java/com/dylanc/loadingstateview/sample/ExampleInstrumentedTest.kt

@@ -1,4 +1,4 @@
-package com.dylanc.loadinghelper.sample
+package com.dylanc.loadingstateview.sample
 
 import androidx.test.platform.app.InstrumentationRegistry
 import androidx.test.ext.junit.runners.AndroidJUnit4

app/src/main/AndroidManifest.xml

@@ -1,36 +1,36 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
   xmlns:tools="http://schemas.android.com/tools"
-  package="com.dylanc.loadinghelper.sample">
+  package="com.dylanc.loadingstateview.sample">
 
   <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
   <uses-permission android:name="android.permission.INTERNET" />
 
   <application
-    android:name=".App"
+    android:name="com.dylanc.loadingstateview.sample.App"
     android:allowBackup="true"
     android:icon="@drawable/ic_logo"
     android:label="@string/app_name"
     android:screenOrientation="portrait"
     android:supportsRtl="true"
     android:theme="@style/AppTheme"
     tools:ignore="GoogleAppIndexingWarning">
-    <activity android:name=".ui.MainActivity">
+    <activity android:name="com.dylanc.loadingstateview.sample.ui.MainActivity">
       <intent-filter>
         <action android:name="android.intent.action.MAIN" />
 
         <category android:name="android.intent.category.LAUNCHER" />
       </intent-filter>
     </activity>
-    <activity android:name=".ui.ActErrorActivity" />
-    <activity android:name=".ui.FragmentEmptyActivity" />
-    <activity android:name=".ui.ViewPlaceholderActivity" />
-    <activity android:name=".ui.ViewPagerActivity" />
-    <activity android:name=".ui.RecyclerViewActivity" />
-    <activity android:name=".ui.CustomHeaderActivity" />
-    <activity android:name=".ui.MultipleHeaderActivity" />
-    <activity android:name=".ui.ScrollingToolbarActivity" />
-    <activity android:name=".ui.BottomEditorActivity"/>
+    <activity android:name="com.dylanc.loadingstateview.sample.ui.ActErrorActivity" />
+    <activity android:name="com.dylanc.loadingstateview.sample.ui.FragmentEmptyActivity" />
+    <activity android:name="com.dylanc.loadingstateview.sample.ui.ViewPlaceholderActivity" />
+    <activity android:name="com.dylanc.loadingstateview.sample.ui.ViewPagerActivity" />
+    <activity android:name="com.dylanc.loadingstateview.sample.ui.RecyclerViewActivity" />
+    <activity android:name="com.dylanc.loadingstateview.sample.ui.CustomHeaderActivity" />
+    <activity android:name="com.dylanc.loadingstateview.sample.ui.MultipleHeaderActivity" />
+    <activity android:name="com.dylanc.loadingstateview.sample.ui.ScrollingToolbarActivity" />
+    <activity android:name="com.dylanc.loadingstateview.sample.ui.BottomEditorActivity"/>
   </application>
 
 </manifest>

app/src/main/java/com/dylanc/loadinghelper/sample/utils/ToolbarUtils.java

@@ -14,16 +14,15 @@
  * limitations under the License.
  */
 
-package com.dylanc.loadinghelper.sample;
+package com.dylanc.loadingstateview.sample;
 
 import android.app.Application;
 
-import com.dylanc.loadinghelper.LoadingHelper;
-import com.dylanc.loadinghelper.ViewType;
-import com.dylanc.loadinghelper.sample.adapter.EmptyAdapter;
-import com.dylanc.loadinghelper.sample.adapter.ErrorAdapter;
-import com.dylanc.loadinghelper.sample.adapter.LoadingAdapter;
-import com.dylanc.loadinghelper.sample.adapter.ToolbarAdapter;
+import com.dylanc.loadingstateview.LoadingStateView;
+import com.dylanc.loadingstateview.ViewType;
+import com.dylanc.loadingstateview.sample.delegate.EmptyViewDelegate;
+import com.dylanc.loadingstateview.sample.delegate.ErrorViewDelegate;
+import com.dylanc.loadingstateview.sample.delegate.LoadingViewDelegate;
 
 import kotlin.Unit;
 
@@ -34,10 +33,10 @@ public class App extends Application {
   @Override
   public void onCreate() {
     super.onCreate();
-    LoadingHelper.setDefaultAdapterPool(adapterPool -> {
-      adapterPool.register(ViewType.LOADING, new LoadingAdapter());
-      adapterPool.register(ViewType.ERROR, new ErrorAdapter());
-      adapterPool.register(ViewType.EMPTY, new EmptyAdapter());
+    LoadingStateView.setViewDelegatePool(pool -> {
+      pool.register(ViewType.LOADING, new LoadingViewDelegate());
+      pool.register(ViewType.ERROR, new ErrorViewDelegate());
+      pool.register(ViewType.EMPTY, new EmptyViewDelegate());
       return Unit.INSTANCE;
     });
   }

app/src/main/java/com/dylanc/loadinghelper/sample/App.java renamed to app/src/main/java/com/dylanc/loadingstateview/sample/App.java

@@ -1,15 +1,15 @@
-package com.dylanc.loadinghelper.sample.animation;
+package com.dylanc.loadingstateview.sample.animation;
 
 import android.view.View;
 
-import com.dylanc.loadinghelper.LoadingHelper;
+import com.dylanc.loadingstateview.LoadingStateView;
 
 import org.jetbrains.annotations.NotNull;
 
 /**
  * @author Dylan Cai
  */
-public class FadeAnimation implements LoadingHelper.Animation {
+public class FadeAnimation implements LoadingStateView.Animation {
 
   private static final long DEFAULT_DURATION = 500;
   private final long duration;

app/src/main/java/com/dylanc/loadinghelper/sample/animation/FadeAnimation.java renamed to app/src/main/java/com/dylanc/loadingstateview/sample/animation/FadeAnimation.java

@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package com.dylanc.loadinghelper.sample.base;
+package com.dylanc.loadingstateview.sample.base;
 
 import androidx.annotation.IdRes;
 import androidx.appcompat.app.AppCompatActivity;
 
-import com.dylanc.loadinghelper.LoadingHelper;
-import com.dylanc.loadinghelper.sample.adapter.NavIconType;
-import com.dylanc.loadinghelper.sample.adapter.ToolbarAdapter;
+import com.dylanc.loadingstateview.LoadingStateView;
+import com.dylanc.loadingstateview.sample.delegate.NavIconType;
+import com.dylanc.loadingstateview.sample.delegate.ToolbarViewDelegate;
 
 /**
  * 这是耦合度较低的封装方式，没有任何抽象方法，可以很方便地将基类里的代码拷贝到其它项目的基类里使用。
@@ -35,7 +35,7 @@
 @SuppressWarnings("unused")
 public class BaseActivity extends AppCompatActivity {
 
-  private LoadingHelper loadingHelper;
+  private LoadingStateView loadingStateView;
 
   @Override
   public void setContentView(int layoutResID) {
@@ -45,11 +45,11 @@ public void setContentView(int layoutResID) {
   public void setContentView(int layoutResID, @IdRes int contentViewId) {
     super.setContentView(layoutResID);
     if (contentViewId == 0) {
-      loadingHelper = new LoadingHelper(this);
+      loadingStateView = new LoadingStateView(this);
     } else {
-      loadingHelper = new LoadingHelper(findViewById(contentViewId));
+      loadingStateView = new LoadingStateView(findViewById(contentViewId));
     }
-    loadingHelper.setOnReloadListener(this::onReload);
+    loadingStateView.setOnReloadListener(this::onReload);
   }
 
   /**
@@ -64,27 +64,27 @@ public void setToolbar(String title, NavIconType type) {
   }
 
   public void setToolbar(String title, NavIconType type, int menuId) {
-    loadingHelper.setDecorHeader(new ToolbarAdapter(title, type, menuId, this::onOptionsItemSelected));
+    loadingStateView.setDecorHeader(new ToolbarViewDelegate(title, type, menuId, this::onOptionsItemSelected));
   }
 
   public void showLoadingView() {
-    loadingHelper.showLoadingView();
+    loadingStateView.showLoadingView();
   }
 
   public void showContentView() {
-    loadingHelper.showContentView();
+    loadingStateView.showContentView();
   }
 
   public void showErrorView() {
-    loadingHelper.showErrorView();
+    loadingStateView.showErrorView();
   }
 
   public void showEmptyView() {
-    loadingHelper.showEmptyView();
+    loadingStateView.showEmptyView();
   }
 
   public void showCustomView(Object viewType) {
-    loadingHelper.showView(viewType);
+    loadingStateView.showView(viewType);
   }
 
   protected void onReload() {

app/src/main/java/com/dylanc/loadinghelper/sample/base/BaseActivity.java renamed to app/src/main/java/com/dylanc/loadingstateview/sample/base/BaseActivity.java

@@ -14,27 +14,27 @@
  * limitations under the License.
  */
 
-package com.dylanc.loadinghelper.sample.adapter;
+package com.dylanc.loadingstateview.sample.delegate;
 
 import android.annotation.SuppressLint;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.EditText;
 
-import com.dylanc.loadinghelper.LoadingHelper;
-import com.dylanc.loadinghelper.sample.R;
-import com.dylanc.loadinghelper.sample.utils.KeyboardUtils;
+import com.dylanc.loadingstateview.LoadingStateView;
+import com.dylanc.loadingstateview.sample.R;
+import com.dylanc.loadingstateview.sample.utils.KeyboardUtils;
 
 import org.jetbrains.annotations.NotNull;
 
 /**
  * @author Dylan Cai
  */
-public class BottomEditorDecorAdapter extends LoadingHelper.DecorAdapter {
-  private OnSendListener onSendListener;
+public class BottomEditorDecorViewDelegate extends LoadingStateView.DecorViewDelegate {
+  private final OnSendListener onSendListener;
 
-  public BottomEditorDecorAdapter(OnSendListener onSendListener) {
+  public BottomEditorDecorViewDelegate(OnSendListener onSendListener) {
     this.onSendListener = onSendListener;
   }
 

app/src/main/java/com/dylanc/loadinghelper/sample/adapter/BottomEditorDecorAdapter.java renamed to app/src/main/java/com/dylanc/loadingstateview/sample/delegate/BottomEditorDecorViewDelegate.java

@@ -14,28 +14,28 @@
  * limitations under the License.
  */
 
-package com.dylanc.loadinghelper.sample.adapter;
+package com.dylanc.loadingstateview.sample.delegate;
 
 import androidx.annotation.NonNull;
 import android.view.LayoutInflater;
 import android.view.ViewGroup;
 
-import com.dylanc.loadinghelper.LoadingHelper;
-import com.dylanc.loadinghelper.sample.R;
+import com.dylanc.loadingstateview.LoadingStateView;
+import com.dylanc.loadingstateview.sample.R;
 
 /**
  * @author Dylan Cai
  */
-public class EmptyAdapter extends LoadingHelper.Adapter<LoadingHelper.ViewHolder> {
+public class CoolLoadingViewDelegate extends LoadingStateView.ViewDelegate<LoadingStateView.ViewHolder> {
 
   @NonNull
   @Override
-  public LoadingHelper.ViewHolder onCreateViewHolder(@NonNull LayoutInflater inflater, @NonNull ViewGroup parent) {
-    return new LoadingHelper.ViewHolder(inflater.inflate(R.layout.layout_empty, parent, false));
+  public LoadingStateView.ViewHolder onCreateViewHolder(@NonNull LayoutInflater inflater, @NonNull ViewGroup parent) {
+    return new LoadingStateView.ViewHolder(inflater.inflate(R.layout.layout_cool_loading, parent, false));
   }
 
   @Override
-  public void onBindViewHolder(@NonNull LoadingHelper.ViewHolder holder) {
+  public void onBindViewHolder(@NonNull LoadingStateView.ViewHolder holder) {
 
   }
 }