Skip to content

Commit 1f89df4

Browse files
walgrwalgr
committed
日常提交 2022-08-02.
1 parent 541da90 commit 1f89df4

12 files changed

Lines changed: 295 additions & 296 deletions

File tree

‎Quick/build.gradle‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -33,15 +33,15 @@ android {
3333

3434
dependencies {
3535

36-
implementation 'androidx.core:core-ktx:1.8.0'
37-
implementation 'androidx.appcompat:appcompat:1.4.2'
38-
implementation 'com.google.android.material:material:1.6.1'
36+
implementation 'androidx.core:core-ktx:1.3.1'
37+
implementation 'androidx.appcompat:appcompat:1.2.0'
38+
implementation 'com.google.android.material:material:1.2.1'
3939
//约束布局
40-
implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
40+
implementation 'androidx.constraintlayout:constraintlayout:2.0.1'
4141
//列表
4242
implementation 'androidx.recyclerview:recyclerview:1.2.1'
4343
//Glide
44-
implementation 'com.github.bumptech.glide:glide:4.13.1'
44+
implementation 'com.github.bumptech.glide:glide:4.7.1'
4545

4646
if (IS_REMOTE.toBoolean()) {
4747
api deps.quickbind.base

‎Quick/src/main/java/com/wpf/app/quick/helper/attribute/GlideAttributeHelper.kt‎

Lines changed: 67 additions & 67 deletions
Original file line numberDiff line numberDiff line change
@@ -1,67 +1,67 @@
1-
package com.wpf.app.quick.helper.attribute
2-
3-
import android.content.Context
4-
import android.util.AttributeSet
5-
import androidx.annotation.DrawableRes
6-
import com.wpf.app.quick.R
7-
import com.wpf.app.quick.constant.*
8-
import com.wpf.app.quick.helper.attribute.base.AutoGetAttributeHelper
9-
10-
/**
11-
* Created by 王朋飞 on 2022/4/29.
12-
* Glide 参数配置帮助类
13-
*/
14-
open class GlideAttributeHelper constructor(
15-
context: Context,
16-
attributeSet: AttributeSet
17-
) : AutoGetAttributeHelper(context, attributeSet, R.styleable.GlideImageView) {
18-
19-
companion object {
20-
const val asDrawable = 0
21-
const val asBitmap = 1
22-
const val asGif = 2
23-
}
24-
25-
var transcodeType:Int? = null
26-
get() {
27-
return when (field) {
28-
0 -> asDrawable
29-
1 -> asBitmap
30-
2 -> asGif
31-
else -> asDrawable
32-
}
33-
}
34-
var scaleType: Int? = null
35-
get() {
36-
return when (field) {
37-
0 -> MATRIX
38-
1 -> FIT_XY
39-
2 -> FIT_START
40-
3 -> FIT_CENTER
41-
4 -> FIT_END
42-
5 -> CENTER
43-
6 -> CENTER_CROP
44-
7 -> CENTER_INSIDE
45-
8 -> CIRCLE_CROP
46-
else -> FIT_CENTER
47-
}
48-
}
49-
var loadUrl: String? = null
50-
51-
//所有角
52-
var roundedCorners = 0
53-
//左上圆角
54-
var topLeftRadius = 0F
55-
//右上圆角
56-
var topRightRadius = 0F
57-
//左下圆角
58-
var bottomLeftRadius = 0F
59-
//右下圆角
60-
var bottomRightRadius = 0F
61-
62-
@DrawableRes
63-
var placeholder: Int = 0
64-
65-
@DrawableRes
66-
var error: Int = 0
67-
}
1+
//package com.wpf.app.quick.helper.attribute
2+
//
3+
//import android.content.Context
4+
//import android.util.AttributeSet
5+
//import androidx.annotation.DrawableRes
6+
//import com.wpf.app.quick.R
7+
//import com.wpf.app.quick.constant.*
8+
//import com.wpf.app.quick.helper.attribute.base.AutoGetAttributeHelper
9+
//
10+
///**
11+
// * Created by 王朋飞 on 2022/4/29.
12+
// * Glide 参数配置帮助类
13+
// */
14+
//open class GlideAttributeHelper constructor(
15+
// context: Context,
16+
// attributeSet: AttributeSet
17+
//) : AutoGetAttributeHelper(context, attributeSet, R.styleable.GlideImageView) {
18+
//
19+
// companion object {
20+
// const val asDrawable = 0
21+
// const val asBitmap = 1
22+
// const val asGif = 2
23+
// }
24+
//
25+
// var transcodeType:Int? = null
26+
// get() {
27+
// return when (field) {
28+
// 0 -> asDrawable
29+
// 1 -> asBitmap
30+
// 2 -> asGif
31+
// else -> asDrawable
32+
// }
33+
// }
34+
// var scaleType: Int? = null
35+
// get() {
36+
// return when (field) {
37+
// 0 -> MATRIX
38+
// 1 -> FIT_XY
39+
// 2 -> FIT_START
40+
// 3 -> FIT_CENTER
41+
// 4 -> FIT_END
42+
// 5 -> CENTER
43+
// 6 -> CENTER_CROP
44+
// 7 -> CENTER_INSIDE
45+
// 8 -> CIRCLE_CROP
46+
// else -> FIT_CENTER
47+
// }
48+
// }
49+
// var loadUrl: String? = null
50+
//
51+
// //所有角
52+
// var roundedCorners = 0
53+
// //左上圆角
54+
// var topLeftRadius = 0F
55+
// //右上圆角
56+
// var topRightRadius = 0F
57+
// //左下圆角
58+
// var bottomLeftRadius = 0F
59+
// //右下圆角
60+
// var bottomRightRadius = 0F
61+
//
62+
// @DrawableRes
63+
// var placeholder: Int = 0
64+
//
65+
// @DrawableRes
66+
// var error: Int = 0
67+
//}

‎Quick/src/main/java/com/wpf/app/quick/helper/attribute/MultiFunctionAttributeHelper.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,14 +34,14 @@ class MultiFunctionAttributeHelper
3434
@DrawableRes var titleBackground: Int? = null
3535
var titleSize: Int? = null
3636
@ColorRes var titleColor: Int? = null
37-
var titleStyle: Int? = null
37+
var titleWpfStyle: Int? = null
3838
var titleMaxLine: Int? = null
3939

4040
var subTitle: String? = null
4141
@DrawableRes var subTitleBackground: Int? = null
4242
var subTitleSize: Int? = null
4343
@ColorRes var subTitleColor: Int? = null
44-
var subTitleStyle: Int? = null
44+
var subTitleWpfStyle: Int? = null
4545
var subTitleMarginTop: Int? = null
4646
var subTitleMaxLine: Int? = null
4747

‎Quick/src/main/java/com/wpf/app/quick/widgets/MultiFunctionView.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@ class MultiFunctionView @JvmOverloads constructor(
160160
attributeHelper.titleMaxLine?.let {
161161
setTitleMaxLine(it)
162162
}
163-
attributeHelper.titleStyle?.let {
163+
attributeHelper.titleWpfStyle?.let {
164164
setTitleStyle(TypefaceHelper.getAndroidTypeface(it))
165165
}
166166
}
@@ -181,7 +181,7 @@ class MultiFunctionView @JvmOverloads constructor(
181181
attributeHelper.subTitleMaxLine?.let {
182182
setSubTitleMaxLine(it)
183183
}
184-
attributeHelper.subTitleStyle?.let {
184+
attributeHelper.subTitleWpfStyle?.let {
185185
setSubTitleStyle(TypefaceHelper.getAndroidTypeface(it))
186186
}
187187
attributeHelper.subTitleMarginTop?.let {

0 commit comments

Comments
 (0)