Skip to content

Commit 4be61af

Browse files
author
zhujiang2
committed
加入lottie，优化用户体验
升级项目版本
1 parent 2f1b5c9 commit 4be61af

15 files changed

+100
-96
lines changed

‎.idea/misc.xml

+4
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎app/src/main/java/com/zj/play/home/HomePageFragment.kt

+2
Original file line numberDiff line numberDiff line change
@@ -75,9 +75,11 @@ class HomePageFragment : ArticleCollectBaseFragment() {
7575
bannerAdapter = ImageAdapter(requireContext(), viewModel.bannerList)
7676
bannerAdapter2 = ImageAdapter(requireContext(), viewModel.bannerList2)
7777
homeBanner.adapter = bannerAdapter
78+
homeBanner.setBannerRound(20f)
7879
homeBanner.setIndicator(CircleIndicator(context)).start()
7980
homeBanner2.adapter = bannerAdapter2
8081
homeBanner2.setIndicator(CircleIndicator(context)).start()
82+
homeBanner2.setBannerRound(20f)
8183
homeToTopRecyclerView.setRecyclerViewLayoutManager(true)
8284
articleAdapter = ArticleAdapter(requireContext(), viewModel.articleList)
8385
homeToTopRecyclerView.onRefreshListener({

‎app/src/main/res/layout/fragment_home_page.xml

+6-2
Original file line numberDiff line numberDiff line change
@@ -17,17 +17,21 @@
1717
<com.youth.banner.Banner
1818
android:id="@+id/homeBanner"
1919
android:layout_width="match_parent"
20-
android:layout_height="@dimen/dp_180" />
20+
android:layout_height="@dimen/dp_180"
21+
android:layout_marginHorizontal="@dimen/dp_10"
22+
android:layout_marginTop="@dimen/dp_10" />
2123

2224
<com.youth.banner.Banner
2325
android:id="@+id/homeBanner2"
2426
android:layout_width="match_parent"
2527
android:layout_height="wrap_content"
28+
android:layout_marginHorizontal="@dimen/dp_10"
29+
android:layout_marginVertical="@dimen/dp_3"
2630
android:visibility="gone" />
2731

2832
<com.zj.play.base.ToTopRecyclerView
2933
android:id="@+id/homeToTopRecyclerView"
3034
android:layout_width="match_parent"
31-
android:layout_height="match_parent"/>
35+
android:layout_height="match_parent" />
3236

3337
</LinearLayout>

‎config.gradle

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ ext {
44
buildToolsVersion : "31.0.3",
55
minSdkVersion : 23,
66
targetSdkVersion : 31,
7-
versionCode : 21,
8-
versionName : "4.1.0",
7+
versionCode : 22,
8+
versionName : "4.2.0",
99
testInstrumentationRunner: "androidx.test.runner.AndroidJUnitRunner",
1010
consumerProguardFiles : 'consumer-rules.pro',
1111
]

‎core/build.gradle

+2
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,8 @@ dependencies {
7474
api "com.github.bumptech.glide:glide:$glide_version"
7575
annotationProcessor "com.github.bumptech.glide:compiler:$glide_version"
7676

77+
//Lottie动画
78+
implementation "com.airbnb.android:lottie:5.0.3"
7779

7880
def activity_version = "1.4.0"
7981
api "androidx.activity:activity-ktx:$activity_version"

‎core/src/main/java/com/zj/core/view/base/BaseActivity.kt

+1-2
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ import android.os.Bundle
77
import android.util.Log
88
import android.view.View
99
import android.widget.FrameLayout
10-
import android.widget.ProgressBar
1110
import androidx.annotation.CallSuper
1211
import androidx.appcompat.app.AppCompatActivity
1312
import androidx.lifecycle.LiveData
@@ -30,7 +29,7 @@ abstract class BaseActivity : AppCompatActivity(), ILce, BaseActivityInit {
3029
/**
3130
* Activity中显示加载等待的控件。
3231
*/
33-
private var loading: ProgressBar? = null
32+
private var loading: View? = null
3433

3534
/**
3635
* Activity中由于服务器异常导致加载失败显示的布局。

‎core/src/main/java/com/zj/core/view/base/BaseFragment.kt

+4-6
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,6 @@ import android.view.LayoutInflater
66
import android.view.View
77
import android.view.ViewGroup
88
import android.widget.FrameLayout
9-
import android.widget.ProgressBar
10-
import android.widget.RelativeLayout
119
import androidx.annotation.CallSuper
1210
import androidx.fragment.app.Fragment
1311
import androidx.lifecycle.LiveData
@@ -25,23 +23,23 @@ abstract class BaseFragment : Fragment(), ILce, BaseFragmentInit {
2523
/**
2624
* Fragment中由于服务器异常导致加载失败显示的布局。
2725
*/
28-
private var loadErrorView: RelativeLayout? = null
26+
private var loadErrorView: View? = null
2927

3028
/**
3129
* Fragment中由于网络异常导致加载失败显示的布局。
3230
*/
33-
private var badNetworkView: RelativeLayout? = null
31+
private var badNetworkView: View? = null
3432

3533
/**
3634
* Fragment中当界面上没有任何内容时展示的布局。
3735
*/
38-
private var noContentView: RelativeLayout? = null
36+
private var noContentView: View? = null
3937

4038

4139
/**
4240
* Fragment中显示加载等待的控件。
4341
*/
44-
private var loading: ProgressBar? = null
42+
private var loading: View? = null
4543

4644
private var defaultLce: ILce? = null
4745

‎core/src/main/java/com/zj/core/view/base/lce/DefaultLceImpl.kt

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package com.zj.core.view.base.lce
22

33
import android.view.View
4-
import android.widget.ProgressBar
54
import android.widget.TextView
65
import com.zj.core.R
76

@@ -11,7 +10,7 @@ import com.zj.core.R
1110
* @author zhujiang
1211
*/
1312
class DefaultLceImpl constructor(
14-
private val loading: ProgressBar?,
13+
private val loading: View?,
1514
private val loadErrorView: View?,
1615
private val badNetworkView: View?,
1716
private val noContentView: View?

‎core/src/main/res/layout/bad_network_view.xml

+22-25
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,31 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
2+
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
3+
xmlns:app="http://schemas.android.com/apk/res-auto"
34
android:id="@+id/badNetworkRootView"
45
android:layout_width="match_parent"
56
android:layout_height="match_parent"
67
android:background="@color/wall"
78
android:focusable="true"
8-
android:foreground="?android:selectableItemBackground">
9+
android:foreground="?android:selectableItemBackground"
10+
android:gravity="center"
11+
android:orientation="vertical">
912

10-
<LinearLayout
11-
android:layout_width="match_parent"
12-
android:layout_height="wrap_content"
13-
android:layout_centerInParent="true"
14-
android:orientation="vertical">
15-
16-
<ImageView
17-
android:layout_width="@dimen/dp_200"
18-
android:layout_height="@dimen/dp_100"
19-
android:layout_gravity="center_horizontal"
20-
android:src="@drawable/bad_network_image" />
13+
<com.airbnb.lottie.LottieAnimationView
14+
android:layout_width="@dimen/dp_200"
15+
android:layout_height="@dimen/dp_200"
16+
android:layout_gravity="center"
17+
app:lottie_autoPlay="true"
18+
app:lottie_loop="true"
19+
app:lottie_rawRes="@raw/play_error" />
2120

22-
<TextView
23-
android:layout_width="wrap_content"
24-
android:layout_height="wrap_content"
25-
android:layout_gravity="center_horizontal"
26-
android:layout_marginTop="@dimen/dp_20"
27-
android:layout_marginBottom="@dimen/dp_20"
28-
android:text="@string/bad_network_view_tip"
29-
android:textColor="@color/secondary_text"
30-
android:textSize="@dimen/sp_13" />
31-
32-
</LinearLayout>
21+
<TextView
22+
android:layout_width="wrap_content"
23+
android:layout_height="wrap_content"
24+
android:layout_gravity="center_horizontal"
25+
android:layout_marginTop="@dimen/dp_20"
26+
android:layout_marginBottom="@dimen/dp_20"
27+
android:text="@string/bad_network_view_tip"
28+
android:textColor="@color/secondary_text"
29+
android:textSize="@dimen/sp_13" />
3330

34-
</RelativeLayout>
31+
</LinearLayout>

‎core/src/main/res/layout/load_error_view.xml

+23-26
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,30 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
2+
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
3+
xmlns:app="http://schemas.android.com/apk/res-auto"
34
xmlns:tools="http://schemas.android.com/tools"
45
android:layout_width="match_parent"
56
android:layout_height="match_parent"
6-
android:background="@color/wall">
7+
android:background="@color/wall"
8+
android:gravity="center"
9+
android:orientation="vertical">
710

8-
<LinearLayout
9-
android:layout_width="match_parent"
10-
android:layout_height="wrap_content"
11-
android:layout_centerInParent="true"
12-
android:orientation="vertical">
13-
14-
<ImageView
15-
android:layout_width="@dimen/dp_200"
16-
android:layout_height="@dimen/dp_100"
17-
android:layout_gravity="center_horizontal"
18-
android:src="@drawable/bad_loading" />
11+
<com.airbnb.lottie.LottieAnimationView
12+
android:layout_width="@dimen/dp_200"
13+
android:layout_height="@dimen/dp_200"
14+
android:layout_gravity="center"
15+
app:lottie_autoPlay="true"
16+
app:lottie_loop="true"
17+
app:lottie_rawRes="@raw/play_error" />
1918

20-
<TextView
21-
android:id="@+id/loadErrorText"
22-
android:layout_width="wrap_content"
23-
android:layout_height="wrap_content"
24-
android:layout_gravity="center_horizontal"
25-
android:layout_marginTop="@dimen/dp_20"
26-
android:layout_marginBottom="@dimen/dp_20"
27-
android:textColor="@color/secondary_text"
28-
android:textSize="@dimen/sp_13"
29-
tools:text="@string/failed_load_data" />
30-
31-
</LinearLayout>
19+
<TextView
20+
android:id="@+id/loadErrorText"
21+
android:layout_width="wrap_content"
22+
android:layout_height="wrap_content"
23+
android:layout_gravity="center_horizontal"
24+
android:layout_marginTop="@dimen/dp_20"
25+
android:layout_marginBottom="@dimen/dp_20"
26+
android:textColor="@color/secondary_text"
27+
android:textSize="@dimen/sp_13"
28+
tools:text="@string/failed_load_data" />
3229

33-
</RelativeLayout>
30+
</LinearLayout>

‎core/src/main/res/layout/loading.xml

+6-5
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<ProgressBar xmlns:android="http://schemas.android.com/apk/res/android"
2+
<com.airbnb.lottie.LottieAnimationView xmlns:android="http://schemas.android.com/apk/res/android"
3+
xmlns:app="http://schemas.android.com/apk/res-auto"
34
android:id="@+id/loading"
45
android:layout_width="@dimen/dp_200"
5-
android:layout_height="@dimen/dp_110"
6+
android:layout_height="@dimen/dp_200"
67
android:layout_gravity="center"
7-
android:indeterminate="true"
8-
android:indeterminateDrawable="@drawable/loading_animation"
9-
android:indeterminateTintMode="src_atop" />
8+
app:lottie_autoPlay="true"
9+
app:lottie_loop="true"
10+
app:lottie_rawRes="@raw/play_load" />

‎core/src/main/res/layout/no_content_view.xml

+24-26
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,31 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
2+
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
3+
xmlns:app="http://schemas.android.com/apk/res-auto"
34
xmlns:tools="http://schemas.android.com/tools"
45
android:layout_width="match_parent"
56
android:layout_height="match_parent"
6-
android:background="@color/wall">
7+
android:layout_gravity="center"
8+
android:background="@color/wall"
9+
android:gravity="center"
10+
android:orientation="vertical">
711

8-
<LinearLayout
9-
android:layout_width="match_parent"
10-
android:layout_height="wrap_content"
11-
android:layout_centerInParent="true"
12-
android:orientation="vertical">
13-
14-
<ImageView
15-
android:layout_width="@dimen/dp_200"
16-
android:layout_height="@dimen/dp_100"
17-
android:layout_gravity="center_horizontal"
18-
android:src="@drawable/no_content_image" />
12+
<com.airbnb.lottie.LottieAnimationView
13+
android:layout_width="@dimen/dp_200"
14+
android:layout_height="@dimen/dp_200"
15+
android:layout_gravity="center"
16+
app:lottie_autoPlay="true"
17+
app:lottie_loop="true"
18+
app:lottie_rawRes="@raw/play_no_data" />
1919

20-
<TextView
21-
android:id="@+id/noContentText"
22-
android:layout_width="wrap_content"
23-
android:layout_height="wrap_content"
24-
android:layout_gravity="center_horizontal"
25-
android:layout_marginTop="@dimen/dp_20"
26-
android:layout_marginBottom="@dimen/dp_20"
27-
android:textColor="@color/secondary_text"
28-
android:textSize="@dimen/sp_13"
29-
tools:text="没有更多内容了" />
30-
31-
</LinearLayout>
20+
<TextView
21+
android:id="@+id/noContentText"
22+
android:layout_width="wrap_content"
23+
android:layout_height="wrap_content"
24+
android:layout_gravity="center_horizontal"
25+
android:layout_marginTop="@dimen/dp_20"
26+
android:layout_marginBottom="@dimen/dp_20"
27+
android:textColor="@color/secondary_text"
28+
android:textSize="@dimen/sp_13"
29+
tools:text="没有更多内容了" />
3230

33-
</RelativeLayout>
31+
</LinearLayout>

‎core/src/main/res/raw/play_error.json

+1
Large diffs are not rendered by default.

‎core/src/main/res/raw/play_load.json

+1
Large diffs are not rendered by default.

‎core/src/main/res/raw/play_no_data.json

+1
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)