diff --git a/README.md b/README.md index 872c9b8..2ed6895 100644 --- a/README.md +++ b/README.md @@ -46,7 +46,7 @@ - **LabelView** - 角标 + 角标,一个简单的Android标签控件. [原始项目地址](https://github.com/H07000223/FlycoLabelView) @@ -181,7 +181,7 @@ **Version** - 【0.2.2】 + 【0.3.0】 # Installation @@ -199,9 +199,28 @@ Step 1. Add the JitPack repository to your build file Step 2. Add the dependency dependencies { - compile 'com.github.shichunlei:MyLibrary:0.2.2' + compile 'com.github.shichunlei:MyLibrary:0.3.0' } +或者 + +Step 1. Add the JitPack repository to your build file + + + + jitpack.io + https://jitpack.io + + + +Step 2. Add the dependency + + + com.github.shichunlei + MyLibrary + 0.3.0 + + # Usage 参见sample示例 @@ -848,6 +867,27 @@ Java =========================================================================================== +### LabelView 用法 + + + +自定义属性 + +|name|format|description| +|:---:|:---:|:---:| +| lv_text | string | 设置文字内容 +| lv_text_color | color | 设置文字颜色,默认#ffffff +| lv_text_size | dimension | 设置文字大小,默认11sp +| lv_text_bold | boolean | 设置文字是否支持加粗,默认true +| lv_text_all_caps | boolean | 设置文字是否支持全部大写,默认true +| lv_background_color | color | 设置背景颜色,默认"#FF4081" +| lv_min_size | dimension | 设置LabelView所在矩形最小宽高,默认mFillTriangle?35dp:50dp +| lv_padding | dimension | 设置文字上下padding,默认3.5dp,mFillTriangle为true时无效 +| lv_gravity | enum | 设置LabelView方向,支持左上或右上或左下或右下,默认左上 +| lv_fill_triangle | boolean | 设置是否填充三角区域,默认false + +=========================================================================================== + ### Sample 中使用到的第三方框架包括 - _[Gson](https://github.com/google/gson)_ @@ -865,6 +905,18 @@ Java # 更新日志 +【0.3.0】 + + add MarqueeView + add CircleMenu + add AnimNumberTextView + add ThreeStateSwitch + add SwitchIconView + add DescProgressView + add WavyLineView + add CouponView + add RippleView + 【0.2.2】 更改刷新为SmartRefresh diff --git a/library/build.gradle b/library/build.gradle index a2bb9e0..affa7f1 100644 --- a/library/build.gradle +++ b/library/build.gradle @@ -11,8 +11,8 @@ android { defaultConfig { minSdkVersion 16 targetSdkVersion 26 - versionCode 18 - versionName "0.1.9" + versionCode 21 + versionName "0.3.0" testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" } diff --git a/sample/src/main/res/drawable/bg.png b/sample/src/main/res/drawable/bg.png new file mode 100755 index 0000000..a564f6f Binary files /dev/null and b/sample/src/main/res/drawable/bg.png differ diff --git a/sample/src/main/res/layout/activity_welcome.xml b/sample/src/main/res/layout/activity_welcome.xml index 97bfc73..bb16ec6 100644 --- a/sample/src/main/res/layout/activity_welcome.xml +++ b/sample/src/main/res/layout/activity_welcome.xml @@ -11,7 +11,6 @@ android:id="@+id/layout" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="@color/colorAccent" android:orientation="horizontal"> diff --git a/sample/src/main/res/values/styles.xml b/sample/src/main/res/values/styles.xml index 37130c4..5fedc87 100644 --- a/sample/src/main/res/values/styles.xml +++ b/sample/src/main/res/values/styles.xml @@ -7,6 +7,7 @@ @color/colorPrimaryDark @color/colorAccent @style/ActivityAnim + @drawable/bg