Skip to content

Commit 1a99f3e

Browse files
committed
1、修改FastMultiStatusView 里设置各种属性支持支持传入资源ID并支持设置Image占位的颜色值(5.0及以上版本)并支持文本与图片颜色同步及单独设置
2、修改FastLoadMoreView里设置各种属性支持支持传入资源ID并支持文本与图片颜色同步及单独设置 3、修改FastMultiStatusView设置占位图片宽高设置错误BUG(设置成TextView对象) 4、新增FastMultiStatusView设置ProgressBar 宽高方法setLoadingSize
1 parent 6475774 commit 1a99f3e

File tree

14 files changed

+362
-71
lines changed

14 files changed

+362
-71
lines changed

apk/sample.apk

1.49 KB
Binary file not shown.

app/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ android {
1515
minSdkVersion ext.minSdkVersion
1616
targetSdkVersion ext.targetSdkVersion
1717
versionCode 219
18-
versionName "2.1.9-gamma"
18+
versionName "2.1.9-delta"
1919
multiDexEnabled true
2020
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
2121
buildConfigField "String", "BASE_URL", "\"https://api.douban.com/\""

app/src/main/java/com/aries/library/fast/demo/App.java

Lines changed: 18 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -127,11 +127,11 @@ public LoadMoreView createDefaultLoadMoreView(BaseQuickAdapter adapter) {
127127
//方式一:设置FastLoadMoreView--可参考FastLoadMoreView.Builder相应set方法
128128
//默认配置请参考FastLoadMoreView.Builder(mContext)里初始化
129129
return new FastLoadMoreView.Builder(mContext)
130-
.setLoadTextColor(Color.MAGENTA)
130+
// .setLoadTextColor(Color.MAGENTA)
131131
// //设置Loading 颜色-5.0以上有效
132132
// .setLoadingProgressColor(Color.MAGENTA)
133133
// //设置Loading drawable--会使Loading颜色失效
134-
// .setLoadingProgressDrawable(mContext.getResources().getDrawable(R.drawable.dialog_loading_wei_bo))
134+
// .setLoadingProgressDrawable(R.drawable.dialog_loading_wei_bo)
135135
// //设置全局TextView颜色
136136
// .setLoadTextColor(Color.MAGENTA)
137137
// //设置全局TextView文字字号
@@ -160,22 +160,25 @@ public IMultiStatusView createMultiStatusView() {
160160
//根据具体情况可设置更多属性具体请参考FastMultiStatusView.Builder里set方法
161161
//默认设置请参考Builder(Context context)里初始化
162162
return new FastMultiStatusView.Builder(mContext)
163-
// .setTextColor(getResources().getColor(R.color.colorMultiText))
163+
// .setTextColor(Color.MAGENTA)
164+
// .setTextColorResource(R.color.colorMultiText)
165+
// .setTextSizeResource(R.dimen.dp_multi_text_size)
164166
// .setTextSize(getResources().getDimensionPixelSize(R.dimen.dp_multi_text_size))
167+
// .setLoadingProgressColorResource(R.color.colorMultiProgress)
165168
// .setLoadingProgressColor(getResources().getColor(R.color.colorMultiProgress))
166169
// .setLoadingTextColor(getResources().getColor(R.color.colorMultiProgress))
167-
// .setLoadingText(getText(R.string.fast_multi_loading))
168-
// .setEmptyText(getText(R.string.fast_multi_empty))
169-
// .setErrorText(getText(R.string.fast_multi_error))
170-
// .setNoNetText(getText(R.string.fast_multi_network))
171-
// .setTextMargin(getResources().getDimensionPixelSize(R.dimen.dp_multi_margin))
172-
// .setImageWidthHeight(getResources().getDimensionPixelSize(R.dimen.dp_multi_image_size))
173-
// .setEmptyImageDrawable(FastUtil.getTintDrawable(
174-
// getResources().getDrawable(R.drawable.fast_img_multi_empty), getResources().getColor(R.color.colorMultiText)))
175-
// .setErrorImageDrawable(FastUtil.getTintDrawable(
176-
// getResources().getDrawable(R.drawable.fast_img_multi_error), getResources().getColor(R.color.colorMultiText)))
177-
// .setNoNetImageDrawable(FastUtil.getTintDrawable(
178-
// getResources().getDrawable(R.drawable.fast_img_multi_network), getResources().getColor(R.color.colorMultiText)))
170+
// .setLoadingText(R.string.fast_multi_loading)
171+
// .setEmptyText(R.string.fast_multi_empty)
172+
// .setErrorText(R.string.fast_multi_error)
173+
// .setNoNetText(R.string.fast_multi_network)
174+
// .setTextMarginResource(R.dimen.dp_multi_margin)
175+
// .setImageWidthHeightResource(R.dimen.dp_multi_image_size)
176+
// .setEmptyImageColorResource(R.color.colorTitleText)
177+
// .setEmptyImageDrawable(R.drawable.fast_img_multi_empty)
178+
// .setErrorImageColorResource(R.color.colorTitleText)
179+
// .setErrorImageDrawable(R.drawable.fast_img_multi_error)
180+
// .setNoNetImageColorResource(R.color.colorTitleText)
181+
// .setNoNetImageDrawable(R.drawable.fast_img_multi_network)
179182
.build();
180183
}
181184
})

app/src/main/java/com/aries/library/fast/demo/adapter/SubjectMovieAdapter.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ protected void convert(BaseViewHolder helper, SubjectsEntity item) {
3232
.setText(R.id.tv_yearMovie, "年份:" + item.year)
3333
.setText(R.id.tv_directorMovie, "导演:" + item.getDirectors())
3434
.setText(R.id.tv_castMovie, "主演:" + item.getCasts());
35-
GlideManager.loadImg(item.images.large, helper.getView(R.id.iv_coverMovie));
35+
GlideManager.loadRoundImg(item.images.large, helper.getView(R.id.iv_coverMovie),2);
3636
LabelView labelView = helper.getView(R.id.lv_topMovie);
3737
labelView.setText("Top" + (helper.getLayoutPosition() + 1));
3838
labelView.setVisibility(isShowTop ? View.VISIBLE : View.GONE);

app/src/main/java/com/aries/library/fast/demo/module/activity/ActivityFragment.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -119,6 +119,9 @@ private void setTab() {
119119
TabLayoutManager.getInstance().setSegmentTabData(this, mSegmentTab, vpContent,
120120
getResources().getStringArray(R.array.arrays_tab_activity), listFragment);
121121
}
122+
//SlidingTabLayout--需这样切换一下不然选中变粗没有效果不知是SlidingTabLayout BUG还是我设置问题
123+
mSlidingTab.setCurrentTab(1);
124+
mSlidingTab.setCurrentTab(0);
122125
}
123126

124127
private List<String> getTitles(int array) {

app/src/main/java/com/aries/library/fast/demo/module/activity/MovieBaseFragment.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ public void loadData(int page) {
127127
DEFAULT_PAGE_SIZE = 15;//接口最大支持单页100
128128
ApiRepository.getInstance().getBaseMovie(mType, page * DEFAULT_PAGE_SIZE, DEFAULT_PAGE_SIZE)
129129
.compose(bindUntilEvent(FragmentEvent.DESTROY))
130-
.subscribe(new FastObserver<BaseMovieEntity>(this.getContext(), new Object[]{mEasyStatusView,this}) {
130+
.subscribe(new FastObserver<BaseMovieEntity>(this.getContext(), new Object[]{mEasyStatusView, this}) {
131131
@Override
132132
public void _onNext(BaseMovieEntity entity) {
133133
mRefreshLayout.finishRefresh();

app/src/main/res/values/dimens.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
<dimen name="dp_margin_item">10dp</dimen>
77
<dimen name="dp_elevation">4dp</dimen>
8-
<dimen name="dp_radius">3dp</dimen>
8+
<dimen name="dp_radius">2dp</dimen>
99

1010
<!--以下属性为lib设置默认属性,在app设置同名属性可覆盖lib效果-->
1111

library/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ android {
99
minSdkVersion 15
1010
targetSdkVersion 25
1111
versionCode 219
12-
versionName "2.1.9-gamma"
12+
versionName "2.1.9-delta"
1313
}
1414
buildTypes {
1515
release {

library/src/main/java/com/aries/library/fast/module/activity/FastWebActivity.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ protected int getProgressColor() {
6363
* @return
6464
*/
6565
protected int getProgressHeight() {
66-
return SizeUtil.dp2px(1);
66+
return SizeUtil.dp2px(0.6f);
6767
}
6868

6969
@Override

library/src/main/java/com/aries/library/fast/util/FastUtil.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,9 @@ public static int getRandom(int length) {
5858
* @return
5959
*/
6060
public static Drawable getTintDrawable(Drawable drawable, @ColorInt int color) {
61-
DrawableCompat.setTint(drawable, color);
61+
if (drawable != null) {
62+
DrawableCompat.setTint(drawable, color);
63+
}
6264
return drawable;
6365
}
6466

0 commit comments

Comments
 (0)