Skip to content

Commit 5cf3920

Browse files
Optimize code
1 parent 76f8063 commit 5cf3920

28 files changed

+63
-83
lines changed

app/src/main/java/com/dylanc/loadingstateview/sample/App.java

+7-7
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@
2020

2121
import com.dylanc.loadingstateview.LoadingStateView;
2222
import com.dylanc.loadingstateview.ViewType;
23-
import com.dylanc.loadingstateview.sample.viewdelegate.EmptyViewDelegate;
24-
import com.dylanc.loadingstateview.sample.viewdelegate.ErrorViewDelegate;
25-
import com.dylanc.loadingstateview.sample.viewdelegate.LoadingViewDelegate;
23+
import com.dylanc.loadingstateview.sample.delegate.EmptyViewDelegate;
24+
import com.dylanc.loadingstateview.sample.delegate.ErrorViewDelegate;
25+
import com.dylanc.loadingstateview.sample.delegate.LoadingViewDelegate;
2626

2727
import kotlin.Unit;
2828

@@ -33,10 +33,10 @@ public class App extends Application {
3333
@Override
3434
public void onCreate() {
3535
super.onCreate();
36-
LoadingStateView.setViewDelegatePool(adapterPool -> {
37-
adapterPool.register(ViewType.LOADING, new LoadingViewDelegate());
38-
adapterPool.register(ViewType.ERROR, new ErrorViewDelegate());
39-
adapterPool.register(ViewType.EMPTY, new EmptyViewDelegate());
36+
LoadingStateView.setViewDelegatePool(pool -> {
37+
pool.register(ViewType.LOADING, new LoadingViewDelegate());
38+
pool.register(ViewType.ERROR, new ErrorViewDelegate());
39+
pool.register(ViewType.EMPTY, new EmptyViewDelegate());
4040
return Unit.INSTANCE;
4141
});
4242
}

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@
2020
import androidx.appcompat.app.AppCompatActivity;
2121

2222
import com.dylanc.loadingstateview.LoadingStateView;
23-
import com.dylanc.loadingstateview.sample.viewdelegate.NavIconType;
24-
import com.dylanc.loadingstateview.sample.viewdelegate.ToolbarViewDelegate;
23+
import com.dylanc.loadingstateview.sample.delegate.NavIconType;
24+
import com.dylanc.loadingstateview.sample.delegate.ToolbarViewDelegate;
2525

2626
/**
2727
* 这是耦合度较低的封装方式,没有任何抽象方法,可以很方便地将基类里的代码拷贝到其它项目的基类里使用。

app/src/main/java/com/dylanc/loadingstateview/sample/delegate/BottomEditorDecorViewDelegate.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* limitations under the License.
1515
*/
1616

17-
package com.dylanc.loadingstateview.sample.viewdelegate;
17+
package com.dylanc.loadingstateview.sample.delegate;
1818

1919
import android.annotation.SuppressLint;
2020
import android.view.LayoutInflater;

app/src/main/java/com/dylanc/loadingstateview/sample/delegate/CoolLoadingViewDelegate.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* limitations under the License.
1515
*/
1616

17-
package com.dylanc.loadingstateview.sample.viewdelegate;
17+
package com.dylanc.loadingstateview.sample.delegate;
1818

1919
import androidx.annotation.NonNull;
2020
import android.view.LayoutInflater;

app/src/main/java/com/dylanc/loadingstateview/sample/delegate/CustomHeaderViewDelegate.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* limitations under the License.
1515
*/
1616

17-
package com.dylanc.loadingstateview.sample.viewdelegate;
17+
package com.dylanc.loadingstateview.sample.delegate;
1818

1919
import android.app.Activity;
2020
import android.os.Build;

app/src/main/java/com/dylanc/loadingstateview/sample/delegate/EmptyViewDelegate.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* limitations under the License.
1515
*/
1616

17-
package com.dylanc.loadingstateview.sample.viewdelegate;
17+
package com.dylanc.loadingstateview.sample.delegate;
1818

1919
import androidx.annotation.NonNull;
2020
import android.view.LayoutInflater;

app/src/main/java/com/dylanc/loadingstateview/sample/delegate/ErrorViewDelegate.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* limitations under the License.
1515
*/
1616

17-
package com.dylanc.loadingstateview.sample.viewdelegate;
17+
package com.dylanc.loadingstateview.sample.delegate;
1818

1919
import androidx.annotation.NonNull;
2020
import android.view.LayoutInflater;

app/src/main/java/com/dylanc/loadingstateview/sample/delegate/LoadingViewDelegate.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* limitations under the License.
1515
*/
1616

17-
package com.dylanc.loadingstateview.sample.viewdelegate;
17+
package com.dylanc.loadingstateview.sample.delegate;
1818

1919
import androidx.annotation.NonNull;
2020
import android.view.LayoutInflater;

app/src/main/java/com/dylanc/loadingstateview/sample/delegate/NavIconType.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* limitations under the License.
1515
*/
1616

17-
package com.dylanc.loadingstateview.sample.viewdelegate;
17+
package com.dylanc.loadingstateview.sample.delegate;
1818

1919
/**
2020
* @author Dylan Cai

app/src/main/java/com/dylanc/loadingstateview/sample/delegate/NothingViewDelegate.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* limitations under the License.
1515
*/
1616

17-
package com.dylanc.loadingstateview.sample.viewdelegate;
17+
package com.dylanc.loadingstateview.sample.delegate;
1818

1919
import androidx.annotation.NonNull;
2020
import android.view.LayoutInflater;

app/src/main/java/com/dylanc/loadingstateview/sample/delegate/PlaceholderViewDelegate.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* limitations under the License.
1515
*/
1616

17-
package com.dylanc.loadingstateview.sample.viewdelegate;
17+
package com.dylanc.loadingstateview.sample.delegate;
1818

1919
import androidx.annotation.NonNull;
2020
import android.view.LayoutInflater;

app/src/main/java/com/dylanc/loadingstateview/sample/delegate/ScrollingDecorViewDelegate.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* limitations under the License.
1515
*/
1616

17-
package com.dylanc.loadingstateview.sample.viewdelegate;
17+
package com.dylanc.loadingstateview.sample.delegate;
1818

1919
import android.annotation.SuppressLint;
2020
import android.app.Activity;

app/src/main/java/com/dylanc/loadingstateview/sample/delegate/SearchHeaderViewDelegate.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* limitations under the License.
1515
*/
1616

17-
package com.dylanc.loadingstateview.sample.viewdelegate;
17+
package com.dylanc.loadingstateview.sample.delegate;
1818

1919
import android.view.LayoutInflater;
2020
import android.view.View;

app/src/main/java/com/dylanc/loadingstateview/sample/delegate/TimeoutViewDelegate.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* limitations under the License.
1515
*/
1616

17-
package com.dylanc.loadingstateview.sample.viewdelegate;
17+
package com.dylanc.loadingstateview.sample.delegate;
1818

1919
import androidx.annotation.NonNull;
2020
import android.view.LayoutInflater;

app/src/main/java/com/dylanc/loadingstateview/sample/delegate/ToolbarViewDelegate.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* limitations under the License.
1515
*/
1616

17-
package com.dylanc.loadingstateview.sample.viewdelegate;
17+
package com.dylanc.loadingstateview.sample.delegate;
1818

1919
import android.app.Activity;
2020
import android.os.Build;

app/src/main/java/com/dylanc/loadingstateview/sample/ui/ActErrorActivity.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323

2424
import com.dylanc.loadingstateview.LoadingStateView;
2525
import com.dylanc.loadingstateview.sample.R;
26-
import com.dylanc.loadingstateview.sample.viewdelegate.NavIconType;
26+
import com.dylanc.loadingstateview.sample.delegate.NavIconType;
2727
import com.dylanc.loadingstateview.sample.animation.FadeAnimation;
2828
import com.dylanc.loadingstateview.sample.utils.HttpUtils;
2929
import com.dylanc.loadingstateview.sample.utils.ToolbarUtils;

app/src/main/java/com/dylanc/loadingstateview/sample/ui/BottomEditorActivity.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,9 @@
2424
import com.dylanc.loadingstateview.LoadingStateView;
2525
import com.dylanc.loadingstateview.ViewType;
2626
import com.dylanc.loadingstateview.sample.R;
27-
import com.dylanc.loadingstateview.sample.viewdelegate.BottomEditorDecorViewDelegate;
28-
import com.dylanc.loadingstateview.sample.viewdelegate.NothingViewDelegate;
29-
import com.dylanc.loadingstateview.sample.viewdelegate.NavIconType;
27+
import com.dylanc.loadingstateview.sample.delegate.BottomEditorDecorViewDelegate;
28+
import com.dylanc.loadingstateview.sample.delegate.NothingViewDelegate;
29+
import com.dylanc.loadingstateview.sample.delegate.NavIconType;
3030
import com.dylanc.loadingstateview.sample.utils.HttpUtils;
3131
import com.dylanc.loadingstateview.sample.utils.ToolbarUtils;
3232

app/src/main/java/com/dylanc/loadingstateview/sample/ui/FragmentEmptyActivity.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
import androidx.fragment.app.FragmentTransaction;
2424

2525
import com.dylanc.loadingstateview.sample.R;
26-
import com.dylanc.loadingstateview.sample.viewdelegate.NavIconType;
26+
import com.dylanc.loadingstateview.sample.delegate.NavIconType;
2727
import com.dylanc.loadingstateview.sample.ui.fragment.EmptyFragment;
2828
import com.dylanc.loadingstateview.sample.utils.ToolbarUtils;
2929

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
import androidx.annotation.Nullable;
2727

2828
import com.dylanc.loadingstateview.sample.R;
29-
import com.dylanc.loadingstateview.sample.viewdelegate.NavIconType;
29+
import com.dylanc.loadingstateview.sample.delegate.NavIconType;
3030
import com.dylanc.loadingstateview.sample.base.BaseActivity;
3131

3232
/**

app/src/main/java/com/dylanc/loadingstateview/sample/ui/MultipleHeaderActivity.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,10 @@
2525
import com.dylanc.loadingstateview.LoadingStateView;
2626
import com.dylanc.loadingstateview.ViewType;
2727
import com.dylanc.loadingstateview.sample.R;
28-
import com.dylanc.loadingstateview.sample.viewdelegate.NothingViewDelegate;
29-
import com.dylanc.loadingstateview.sample.viewdelegate.SearchHeaderViewDelegate;
30-
import com.dylanc.loadingstateview.sample.viewdelegate.ToolbarViewDelegate;
31-
import com.dylanc.loadingstateview.sample.viewdelegate.NavIconType;
28+
import com.dylanc.loadingstateview.sample.delegate.NothingViewDelegate;
29+
import com.dylanc.loadingstateview.sample.delegate.SearchHeaderViewDelegate;
30+
import com.dylanc.loadingstateview.sample.delegate.ToolbarViewDelegate;
31+
import com.dylanc.loadingstateview.sample.delegate.NavIconType;
3232
import com.dylanc.loadingstateview.sample.utils.HttpUtils;
3333

3434
/**

app/src/main/java/com/dylanc/loadingstateview/sample/ui/RecyclerViewActivity.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,8 @@
3737
import com.dylanc.loadingstateview.LoadingStateView;
3838
import com.dylanc.loadingstateview.ViewType;
3939
import com.dylanc.loadingstateview.sample.R;
40-
import com.dylanc.loadingstateview.sample.viewdelegate.CoolLoadingViewDelegate;
41-
import com.dylanc.loadingstateview.sample.viewdelegate.NavIconType;
40+
import com.dylanc.loadingstateview.sample.delegate.CoolLoadingViewDelegate;
41+
import com.dylanc.loadingstateview.sample.delegate.NavIconType;
4242
import com.dylanc.loadingstateview.sample.utils.HttpUtils;
4343
import com.dylanc.loadingstateview.sample.utils.ToolbarUtils;
4444

app/src/main/java/com/dylanc/loadingstateview/sample/ui/ScrollingToolbarActivity.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
import com.dylanc.loadingstateview.LoadingStateView;
2626
import com.dylanc.loadingstateview.ViewType;
2727
import com.dylanc.loadingstateview.sample.R;
28-
import com.dylanc.loadingstateview.sample.viewdelegate.LoadingViewDelegate;
28+
import com.dylanc.loadingstateview.sample.delegate.LoadingViewDelegate;
2929
import com.dylanc.loadingstateview.sample.utils.HttpUtils;
3030
import com.dylanc.loadingstateview.sample.utils.ToolbarUtils;
3131

app/src/main/java/com/dylanc/loadingstateview/sample/ui/ViewPagerActivity.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
import androidx.viewpager.widget.ViewPager;
2828

2929
import com.dylanc.loadingstateview.sample.R;
30-
import com.dylanc.loadingstateview.sample.viewdelegate.NavIconType;
30+
import com.dylanc.loadingstateview.sample.delegate.NavIconType;
3131
import com.dylanc.loadingstateview.sample.ui.fragment.TimeoutFragment;
3232
import com.dylanc.loadingstateview.sample.utils.ToolbarUtils;
3333
import com.google.android.material.tabs.TabLayout;

app/src/main/java/com/dylanc/loadingstateview/sample/ui/ViewPlaceholderActivity.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@
2525
import com.dylanc.loadingstateview.LoadingStateView;
2626
import com.dylanc.loadingstateview.ViewType;
2727
import com.dylanc.loadingstateview.sample.R;
28-
import com.dylanc.loadingstateview.sample.viewdelegate.PlaceholderViewDelegate;
29-
import com.dylanc.loadingstateview.sample.viewdelegate.NavIconType;
28+
import com.dylanc.loadingstateview.sample.delegate.PlaceholderViewDelegate;
29+
import com.dylanc.loadingstateview.sample.delegate.NavIconType;
3030
import com.dylanc.loadingstateview.sample.utils.HttpUtils;
3131
import com.dylanc.loadingstateview.sample.utils.ToolbarUtils;
3232

app/src/main/java/com/dylanc/loadingstateview/sample/ui/fragment/TimeoutFragment.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
import androidx.fragment.app.Fragment;
2727

2828
import com.dylanc.loadingstateview.LoadingStateView;
29-
import com.dylanc.loadingstateview.sample.viewdelegate.TimeoutViewDelegate;
29+
import com.dylanc.loadingstateview.sample.delegate.TimeoutViewDelegate;
3030
import com.dylanc.loadingstateview.sample.databinding.LayoutContentBinding;
3131
import com.dylanc.loadingstateview.sample.utils.HttpUtils;
3232

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

+4-4
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,10 @@
2222

2323
import com.dylanc.loadingstateview.LoadingStateView;
2424
import com.dylanc.loadingstateview.ViewType;
25-
import com.dylanc.loadingstateview.sample.viewdelegate.CustomHeaderViewDelegate;
26-
import com.dylanc.loadingstateview.sample.viewdelegate.ScrollingDecorViewDelegate;
27-
import com.dylanc.loadingstateview.sample.viewdelegate.ToolbarViewDelegate;
28-
import com.dylanc.loadingstateview.sample.viewdelegate.NavIconType;
25+
import com.dylanc.loadingstateview.sample.delegate.CustomHeaderViewDelegate;
26+
import com.dylanc.loadingstateview.sample.delegate.ScrollingDecorViewDelegate;
27+
import com.dylanc.loadingstateview.sample.delegate.ToolbarViewDelegate;
28+
import com.dylanc.loadingstateview.sample.delegate.NavIconType;
2929

3030
import kotlin.jvm.functions.Function1;
3131

build.gradle

+1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11

2+
23
buildscript {
34
ext.kotlin_version = '1.5.20'
45
repositories {

0 commit comments

Comments
 (0)