diff --git a/README.md b/README.md index 5aecf1d..266ae18 100644 --- a/README.md +++ b/README.md @@ -22,7 +22,7 @@ ## 2、 效果 [**Demo下载地址**]( https://fir.im/eft1)

- +

## 3、如何使用 @@ -44,9 +44,9 @@        compile 'com.github.lygttpod:SuperTextView:VERSION_CODE' } ``` -> ### 注意：VERSION_CODE为[![](https://jitpack.io/v/lygttpod/SuperTextView.svg)](https://jitpack.io/#lygttpod/SuperTextView)后面的数字，即最新的[release](https://github.com/lygttpod/SuperTextView/releases)版本号 +> ## 温馨提示：项目中部分代码使用kotlin写的，所以你的项目需要支持kotlin -> ## 重写SuperTextView，功能更加全面，部分方法及属性有变更，1.x版本的老用户请注意 +> ### 注意：VERSION_CODE为[![](https://jitpack.io/v/lygttpod/SuperTextView.svg)](https://jitpack.io/#lygttpod/SuperTextView)后面的数字，即最新的[release](https://github.com/lygttpod/SuperTextView/releases)版本号 ### 3.2、项目中如何使用 #### 3.2.1、布局中如何使用（示例中只列出部分属性，开发者可根据具体需求使用其他属性） @@ -319,15 +319,15 @@ sCenterViewMarginLeft | dimension | 中间view的MarginLeft | 默认10dp sCenterViewMarginRight | dimension | 中间view的MarginRight | 默认10dp sRightViewMarginLeft | dimension | 右边view的MarginLeft | 默认10dp sRightViewMarginRight | dimension | 右边view的MarginRight | 默认10dp -sLeftTextIsBold | boolean | 左边文字是否加粗 | 默认false（暂时去除此属性改为代码动态配置） -sLeftTopTextIsBold | boolean | 左上文字是否加粗 | 默认false（暂时去除此属性改为代码动态配置） -sLeftBottomTextIsBold | boolean | 左下文字是否加粗 | 默认false（暂时去除此属性改为代码动态配置） -sCenterTextIsBold | boolean | 中间文字是否加粗 | 默认false（暂时去除此属性改为代码动态配置） -sCenterTopTextIsBold | boolean | 中上文字是否加粗 | 默认false（暂时去除此属性改为代码动态配置） -sCenterBottomTextIsBold | boolean | 中下文字是否加粗 | 默认false（暂时去除此属性改为代码动态配置） -sRightTextIsBold | boolean | 右边文字是否加粗 | 默认false（暂时去除此属性改为代码动态配置） -sRightTopTextIsBold | boolean | 右上文字是否加粗 | 默认false（暂时去除此属性改为代码动态配置） -sRightBottomTextIsBold | boolean | 右下文字是否加粗 | 默认false（暂时去除此属性改为代码动态配置） +sLeftTextIsBold(移除) | boolean | 左边文字是否加粗 | 默认false（暂时去除此属性改为代码动态配置） +sLeftTopTextIsBold(移除) | boolean | 左上文字是否加粗 | 默认false（暂时去除此属性改为代码动态配置） +sLeftBottomTextIsBold(移除) | boolean | 左下文字是否加粗 | 默认false（暂时去除此属性改为代码动态配置） +sCenterTextIsBold(移除) | boolean | 中间文字是否加粗 | 默认false（暂时去除此属性改为代码动态配置） +sCenterTopTextIsBold(移除) | boolean | 中上文字是否加粗 | 默认false（暂时去除此属性改为代码动态配置） +sCenterBottomTextIsBold(移除) | boolean | 中下文字是否加粗 | 默认false（暂时去除此属性改为代码动态配置） +sRightTextIsBold(移除) | boolean | 右边文字是否加粗 | 默认false（暂时去除此属性改为代码动态配置） +sRightTopTextIsBold(移除) | boolean | 右上文字是否加粗 | 默认false（暂时去除此属性改为代码动态配置） +sRightBottomTextIsBold(移除) | boolean | 右下文字是否加粗 | 默认false（暂时去除此属性改为代码动态配置） sLeftIconRes | reference | 左边图片资源 可以用来显示网络图片或者本地 sRightIconRes | reference | 右边图片资源 可以用来显示网络图片或者本地 sLeftIconWidth | dimension | 左边图片资源的宽度 用于固定图片大小的时候使用 @@ -392,17 +392,6 @@ sRightIconShowCircle | boolean | 右边ImageView是否显示为圆形 | 默认f ## 代码是最好的老师，更多详细用法请查看 [demo](https://github.com/lygttpod/SuperTextView/tree/master/app):feet: -## 打赏支持 - -如果您觉得 SuperTextView 开源库帮你节省了大量的开发时间，请扫描下方的二维码随意打赏，要是能打赏个 10.24 :monkey_face:就太:thumbsup:了。您的支持将鼓励我继续创作:octocat: - - -

- -

- - - # License ``` Copyright 2016 Allen diff --git a/SuperButton_Readme.md b/SuperButton_Readme.md index 449350f..98009ed 100644 --- a/SuperButton_Readme.md +++ b/SuperButton_Readme.md @@ -100,8 +100,8 @@ sSizeWidth | dimension | shape的SizeWidth | 默认0dp sSizeHeight | dimension | shape的SizeHeight | 默认0dp sGradientOrientation | enum | 设置渐变类型
TOP_BOTTOM
TR_BL
RIGHT_LEFT
BR_TL
BOTTOM_TOP
BL_TR
LEFT_RIGHT
TL_BR | 默认rectangle sGradientType | enum | 设置渐变类型
linear
radial
sweep | 默认rectangle -sGradientCenterX | dimension | shape的CenterX | 默认0dp -sGradientCenterY | dimension | shape的CenterY | 默认0dp +sGradientCenterX | float | shape的CenterX | 默认0f +sGradientCenterY | float | shape的CenterY | 默认0f sGradientGradientRadius | dimension | shape的GradientRadius | 默认0dp sGradientStartColor | color | shape的StartColor | sGradientCenterColor | color | shape的CenterColor | diff --git a/app/build.gradle b/app/build.gradle index 3353c48..8c1660a 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -1,4 +1,6 @@ apply plugin: 'com.android.application' +apply plugin: 'kotlin-android' +apply plugin: 'kotlin-android-extensions' android { compileSdkVersion 28 @@ -8,7 +10,7 @@ android { targetSdkVersion 28 versionCode 1 versionName "1.0" - testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" + testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner' } buildTypes { release { @@ -22,15 +24,20 @@ android { dependencies { implementation fileTree(include: ['*.jar'], dir: 'libs') - androidTestImplementation('com.android.support.test.espresso:espresso-core:2.2.2', { + implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0' + androidTestImplementation('androidx.test.espresso:espresso-core:3.1.0', { exclude group: 'com.android.support', module: 'support-annotations' }) implementation project(':library') - implementation 'com.android.support:appcompat-v7:28.0.0' - implementation 'com.android.support:design:28.0.0' + implementation 'androidx.appcompat:appcompat:1.2.0' + implementation 'com.google.android.material:material:1.2.1' implementation 'com.squareup.picasso:picasso:2.5.2' implementation 'com.github.bumptech.glide:glide:3.8.0' implementation 'com.zhy:base-rvadapter:3.0.3' - implementation 'com.android.support.constraint:constraint-layout:1.1.3' - testImplementation 'junit:junit:4.12' + implementation 'androidx.constraintlayout:constraintlayout:2.0.4' + testImplementation 'junit:junit:4.13.1' + implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" +} +repositories { + mavenCentral() } diff --git a/app/src/androidTest/java/com/allen/supertextview/ExampleInstrumentedTest.java b/app/src/androidTest/java/com/allen/supertextview/ExampleInstrumentedTest.java index 8189050..5f3aec6 100644 --- a/app/src/androidTest/java/com/allen/supertextview/ExampleInstrumentedTest.java +++ b/app/src/androidTest/java/com/allen/supertextview/ExampleInstrumentedTest.java @@ -1,8 +1,8 @@ package com.allen.supertextview; import android.content.Context; -import android.support.test.InstrumentationRegistry; -import android.support.test.runner.AndroidJUnit4; +import androidx.test.platform.app.InstrumentationRegistry; +import androidx.test.ext.junit.runners.AndroidJUnit4; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 96e3f0f..b0365e1 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -29,6 +29,7 @@ android:name=".SuperButtonActivity" android:label="SuperButton" /> + diff --git a/app/src/main/java/com/allen/supertextview/ClickActivity.java b/app/src/main/java/com/allen/supertextview/ClickActivity.java index de3b922..f61dcdd 100644 --- a/app/src/main/java/com/allen/supertextview/ClickActivity.java +++ b/app/src/main/java/com/allen/supertextview/ClickActivity.java @@ -1,6 +1,6 @@ package com.allen.supertextview; -import android.support.v7.app.AppCompatActivity; +import androidx.appcompat.app.AppCompatActivity; import android.os.Bundle; import android.view.View; import android.widget.CompoundButton; diff --git a/app/src/main/java/com/allen/supertextview/CommonTextViewActivity.java b/app/src/main/java/com/allen/supertextview/CommonTextViewActivity.java index 9faa400..a53bad3 100644 --- a/app/src/main/java/com/allen/supertextview/CommonTextViewActivity.java +++ b/app/src/main/java/com/allen/supertextview/CommonTextViewActivity.java @@ -1,8 +1,8 @@ package com.allen.supertextview; import android.os.Bundle; -import android.support.annotation.Nullable; -import android.support.v7.app.AppCompatActivity; +import androidx.annotation.Nullable; +import androidx.appcompat.app.AppCompatActivity; import android.widget.Toast; import com.allen.library.CommonTextView; diff --git a/app/src/main/java/com/allen/supertextview/ListActivity.java b/app/src/main/java/com/allen/supertextview/ListActivity.java index b146a4b..5febc2d 100644 --- a/app/src/main/java/com/allen/supertextview/ListActivity.java +++ b/app/src/main/java/com/allen/supertextview/ListActivity.java @@ -1,11 +1,11 @@ package com.allen.supertextview; import android.os.Bundle; -import android.support.annotation.Nullable; -import android.support.v4.widget.SwipeRefreshLayout; -import android.support.v7.app.AppCompatActivity; -import android.support.v7.widget.LinearLayoutManager; -import android.support.v7.widget.RecyclerView; +import androidx.annotation.Nullable; +import androidx.swiperefreshlayout.widget.SwipeRefreshLayout; +import androidx.appcompat.app.AppCompatActivity; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; import android.view.View; import android.widget.Toast; @@ -38,6 +38,16 @@ public class ListActivity extends AppCompatActivity implements SwipeRefreshLayou "https://ss2.baidu.com/6ONYsjip0QIZ8tyhnq/it/u=3244336274,3651700434&fm=80&w=179&h=119&img.JPEG", "https://ss0.baidu.com/6ONWsjip0QIZ8tyhnq/it/u=219781665,3032880226&fm=80&w=179&h=119&img.JPEG", "https://ss1.baidu.com/6ONXsjip0QIZ8tyhnq/it/u=831306574,2792494868&fm=80&w=179&h=119&img.GIF", + "https://ss0.baidu.com/6ONWsjip0QIZ8tyhnq/it/u=1580482776,3214289843&fm=80&w=179&h=119&img.JPEG", + "https://ss2.baidu.com/-vo3dSag_xI4khGko9WTAnF6hhy/vip/whcrop%3D176%2C106/sign=cffe5aed6363f6241c086f41e834d6c9/f3d3572c11dfa9ecb7f287c36ad0f703908fc102.jpg", + "https://ss2.baidu.com/6ONYsjip0QIZ8tyhnq/it/u=1383170885,2038374031&fm=80&w=179&h=119&img.JPEG", + "https://ss1.baidu.com/6ONXsjip0QIZ8tyhnq/it/u=2218526845,522933158&fm=80&w=179&h=119&img.JPEG", + "https://ss0.baidu.com/6ONWsjip0QIZ8tyhnq/it/u=775731846,1370921386&fm=80", + "https://ss1.baidu.com/6ONXsjip0QIZ8tyhnq/it/u=3860616424,1789830124&fm=80&w=179&h=119&img.PNG", + "https://ss0.baidu.com/6ONWsjip0QIZ8tyhnq/it/u=4096069947,473932952&fm=80&w=179&h=119&img.JPEG", + "https://ss2.baidu.com/6ONYsjip0QIZ8tyhnq/it/u=3244336274,3651700434&fm=80&w=179&h=119&img.JPEG", + "https://ss0.baidu.com/6ONWsjip0QIZ8tyhnq/it/u=219781665,3032880226&fm=80&w=179&h=119&img.JPEG", + "https://ss1.baidu.com/6ONXsjip0QIZ8tyhnq/it/u=831306574,2792494868&fm=80&w=179&h=119&img.GIF", }; @@ -68,7 +78,7 @@ public boolean onItemLongClick(View view, RecyclerView.ViewHolder holder, int po } private List getData() { - for (int i = 0; i < 10; i++) { + for (int i = 0; i < url.length; i++) { NewsBean newsBean = new NewsBean(); newsBean.setImgUrl(url[i]); newsBean.setTitle("新闻标题" + i); diff --git a/app/src/main/java/com/allen/supertextview/MainActivity.java b/app/src/main/java/com/allen/supertextview/MainActivity.java index a669e93..37836d0 100644 --- a/app/src/main/java/com/allen/supertextview/MainActivity.java +++ b/app/src/main/java/com/allen/supertextview/MainActivity.java @@ -2,7 +2,7 @@ import android.content.Intent; import android.os.Bundle; -import android.support.v7.app.AppCompatActivity; +import androidx.appcompat.app.AppCompatActivity; import android.view.View; import android.widget.Button; @@ -10,7 +10,7 @@ public class MainActivity extends AppCompatActivity implements View.OnClickListe private Button button0, button1, button2, button3, - button4, button5, button6, button7,button8, list_button, click_button,super_button,super_shape; + button4, button5, button6, button7, button8, list_button, click_button, super_button, super_shape, super_shadow; @Override protected void onCreate(Bundle savedInstanceState) { @@ -30,6 +30,7 @@ protected void onCreate(Bundle savedInstanceState) { click_button = (Button) findViewById(R.id.click_button); super_button = (Button) findViewById(R.id.super_button); super_shape = (Button) findViewById(R.id.super_shape); + super_shadow = (Button) findViewById(R.id.super_shadow); button0.setOnClickListener(this); button1.setOnClickListener(this); @@ -44,6 +45,7 @@ protected void onCreate(Bundle savedInstanceState) { click_button.setOnClickListener(this); super_button.setOnClickListener(this); super_shape.setOnClickListener(this); + super_shadow.setOnClickListener(this); } @Override @@ -107,10 +109,14 @@ public void onClick(View v) { intent.setClass(this, SuperButtonActivity.class); startActivity(intent); break; - case R.id.super_shape: + case R.id.super_shape: intent.setClass(this, ShapeActivity.class); startActivity(intent); break; + case R.id.super_shadow: + intent.setClass(this, ShadowActivity.class); + startActivity(intent); + break; } } diff --git a/app/src/main/java/com/allen/supertextview/ShadowActivity.kt b/app/src/main/java/com/allen/supertextview/ShadowActivity.kt new file mode 100644 index 0000000..cddae2e --- /dev/null +++ b/app/src/main/java/com/allen/supertextview/ShadowActivity.kt @@ -0,0 +1,115 @@ +package com.allen.supertextview + +import android.graphics.Color +import android.os.Bundle +import androidx.appcompat.app.AppCompatActivity +import android.widget.SeekBar +import kotlinx.android.synthetic.main.activity_shadow.* +import java.lang.Exception + +/** + * 
+ *      @author : Allen
+ *      e-mail  : lygttpod@163.com
+ *      date    : 2019/09/21
+ *      desc    :
+ *
+ */ +class ShadowActivity : AppCompatActivity(), SeekBar.OnSeekBarChangeListener { + + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + setContentView(R.layout.activity_shadow) + setShadowColor() + + shadow_color_alpha_sb.setOnSeekBarChangeListener(this) + + shadow_padding_left_sb.setOnSeekBarChangeListener(this) + shadow_padding_top_sb.setOnSeekBarChangeListener(this) + shadow_padding_right_sb.setOnSeekBarChangeListener(this) + shadow_padding_bottom_sb.setOnSeekBarChangeListener(this) + + shadow_left_top_radius_sb.setOnSeekBarChangeListener(this) + shadow_left_bottom_radius_sb.setOnSeekBarChangeListener(this) + shadow_right_top_radius_sb.setOnSeekBarChangeListener(this) + shadow_right_bottom_radius_sb.setOnSeekBarChangeListener(this) + + shadow_all_radius_sb.setOnSeekBarChangeListener(this) + + shape_view.shadowHelper?.let { + it.setShadowAllRadius(10f) + .setShadowLeftWidth(20f) + .setShadowTopWidth(10f) + .setShadowBottomWidth(20f) + .setShadowRightWidth(10f) + .applyToView() + } + + } + + private fun setShadowColor() { + change_shadow_color_btn.setOnClickListener { + val colorString = shadow_color_et.text.toString() + if (colorString.length == 6 || colorString.length == 8) { + try { + val color = Color.parseColor("#$colorString") + shape_view.shadowHelper?.setShadowColor(color)?.applyToView() + } catch (e: Exception) { + } + } + } + } + + override fun onProgressChanged(seekBar: SeekBar, progress: Int, fromUser: Boolean) { + + val size = progress.toFloat() + when (seekBar.id) { + R.id.shadow_color_alpha_sb -> { + shape_view.shadowHelper?.setShadowColorAlpha(size / 100) + } + R.id.shadow_padding_left_sb -> { + shape_view.shadowHelper?.setShadowLeftWidth(size) + } + R.id.shadow_padding_top_sb -> { + shape_view.shadowHelper?.setShadowTopWidth(size) + } + R.id.shadow_padding_right_sb -> { + shape_view.shadowHelper?.setShadowRightWidth(size) + } + R.id.shadow_padding_bottom_sb -> { + shape_view.shadowHelper?.setShadowBottomWidth(size) + } + R.id.shadow_left_top_radius_sb -> { + shadow_all_radius_sb.progress = 0 + shape_view.shadowHelper?.setShadowLeftTopRadius(size) + } + R.id.shadow_left_bottom_radius_sb -> { + shadow_all_radius_sb.progress = 0 + shape_view.shadowHelper?.setShadowLeftBottomRadius(size) + } + R.id.shadow_right_top_radius_sb -> { + shadow_all_radius_sb.progress = 0 + shape_view.shadowHelper?.setShadowRightTopRadius(size) + } + R.id.shadow_right_bottom_radius_sb -> { + shadow_all_radius_sb.progress = 0 + shape_view.shadowHelper?.setShadowRightBottomRadius(size) + } + R.id.shadow_all_radius_sb -> { + shadow_left_top_radius_sb.progress = 0 + shadow_left_bottom_radius_sb.progress = 0 + shadow_right_top_radius_sb.progress = 0 + shadow_right_bottom_radius_sb.progress = 0 + shape_view.shadowHelper?.setShadowAllRadius(size) + } + } + shape_view.shadowHelper?.applyToView() + + } + + override fun onStartTrackingTouch(seekBar: SeekBar?) { + } + + override fun onStopTrackingTouch(seekBar: SeekBar?) { + } +} \ No newline at end of file diff --git a/app/src/main/java/com/allen/supertextview/ShapeActivity.java b/app/src/main/java/com/allen/supertextview/ShapeActivity.java deleted file mode 100644 index aa4772b..0000000 --- a/app/src/main/java/com/allen/supertextview/ShapeActivity.java +++ /dev/null @@ -1,81 +0,0 @@ -package com.allen.supertextview; - -import android.os.Bundle; -import android.support.annotation.Nullable; -import android.support.v7.app.AppCompatActivity; -import android.view.View; -import android.widget.Button; -import android.widget.LinearLayout; -import android.widget.TextView; - -import com.allen.library.utils.ShapeBuilder; - -/** - * 
- *      @author : Allen
- *      e-mail  : lygttpod@163.com
- *      date    : 2019/05/31
- *      desc    :
- *
- */ -public class ShapeActivity extends AppCompatActivity { - - @Override - protected void onCreate(@Nullable Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - setContentView(R.layout.activiy_shape); - - Button btn = findViewById(R.id.btn); - TextView tv = findViewById(R.id.tv); - View view = findViewById(R.id.view); - LinearLayout linearLayout = findViewById(R.id.ll); - - getColorShape().into(btn); - - getColorShape().into(tv); - - getViewShape().into(view); - - getLinearLayoutShape().into(linearLayout); - - } - - private ShapeBuilder getNormalShape() { - ShapeBuilder shapeBuilder = new ShapeBuilder() - .setShapeType(ShapeBuilder.RECTANGLE) - .setShapeSolidColor(getResources().getColor(R.color.colorAccent)) - .setShapeStrokeColor(getResources().getColor(R.color.colorPrimary)) - .setShapeStrokeWidth(2) - .setShapeCornersRadius(10); - return shapeBuilder; - } - - private ShapeBuilder getColorShape() { - ShapeBuilder shapeBuilder = getNormalShape() - .setShapeUseSelector(true) - .setShapeSelectorNormalColor(getResources().getColor(R.color.colorAccent)) - .setShapeSelectorDisableColor(getResources().getColor(R.color.colorPrimary)) - .setShapeSelectorPressedColor(getResources().getColor(R.color.common_pressed)); - return shapeBuilder; - } - - private ShapeBuilder getLinearLayoutShape() { - ShapeBuilder shapeBuilder = getNormalShape() - .setShapeGradientAngle(45) - .setShapeGradientStartColor(getResources().getColor(R.color.colorAccent)) - .setShapeGradientCenterColor(getResources().getColor(R.color.white)) - .setShapeGradientEndColor(getResources().getColor(R.color.colorPrimary)); - return shapeBuilder; - } - - private ShapeBuilder getViewShape() { - ShapeBuilder shapeBuilder = getNormalShape() - .setShapeGradientAngle(315) - .setShapeGradientCenterY(10) - .setShapeGradientCenterX(10) - .setShapeGradientStartColor(getResources().getColor(R.color.colorAccent)) - .setShapeGradientEndColor(getResources().getColor(R.color.white)); - return shapeBuilder; - } - -} diff --git a/app/src/main/java/com/allen/supertextview/ShapeActivity.kt b/app/src/main/java/com/allen/supertextview/ShapeActivity.kt new file mode 100644 index 0000000..c3614fe --- /dev/null +++ b/app/src/main/java/com/allen/supertextview/ShapeActivity.kt @@ -0,0 +1,49 @@ +package com.allen.supertextview + +import android.os.Bundle +import androidx.appcompat.app.AppCompatActivity +import com.allen.library.helper.ShapeBuilder +import com.allen.library.helper.ShapeType +import kotlinx.android.synthetic.main.activiy_shape.* + +/** + * 
+ * @author : Allen
+ * e-mail  : lygttpod@163.com
+ * date    : 2019/05/31
+ * desc    :
+
* + */ +class ShapeActivity : AppCompatActivity() { + + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + setContentView(R.layout.activiy_shape) + + shape_text_view.setOnClickListener { + shape_text_view.shapeBuilder?.let { + it.setShapeType(ShapeType.RECTANGLE) + .setShapeSolidColor(resources.getColor(R.color.colorAccent)) + .setShapeStrokeColor(resources.getColor(R.color.colorPrimary)) + .setShapeStrokeWidth(2) + .setShapeCornersRadius(30f) + .into(shape_text_view) + } + } + + } + + /** + * 如果ShapeXXXView无法满足你的布局需求可以，使用ShapeBuilder对任何view设置shape属性 + * 用法如下： + * normalShape.into("你的任意View") + */ + private val normalShape: ShapeBuilder + get() = ShapeBuilder() + .setShapeType(ShapeType.RECTANGLE) + .setShapeSolidColor(resources.getColor(R.color.colorAccent)) + .setShapeStrokeColor(resources.getColor(R.color.colorPrimary)) + .setShapeStrokeWidth(2) + .setShapeCornersRadius(30f) + +} diff --git a/app/src/main/java/com/allen/supertextview/SuperButtonActivity.java b/app/src/main/java/com/allen/supertextview/SuperButtonActivity.java index 2d9b034..f41328a 100644 --- a/app/src/main/java/com/allen/supertextview/SuperButtonActivity.java +++ b/app/src/main/java/com/allen/supertextview/SuperButtonActivity.java @@ -1,7 +1,7 @@ package com.allen.supertextview; import android.os.Bundle; -import android.support.v7.app.AppCompatActivity; +import androidx.appcompat.app.AppCompatActivity; import com.allen.library.SuperButton; diff --git a/app/src/main/java/com/allen/supertextview/TypeActivity.java b/app/src/main/java/com/allen/supertextview/TypeActivity.java index 183f9b2..d3f854b 100644 --- a/app/src/main/java/com/allen/supertextview/TypeActivity.java +++ b/app/src/main/java/com/allen/supertextview/TypeActivity.java @@ -2,11 +2,15 @@ import android.graphics.Color; import android.os.Bundle; -import android.support.v7.app.AppCompatActivity; +import androidx.appcompat.app.AppCompatActivity; import android.view.Gravity; import com.allen.library.SuperTextView; -import com.allen.library.utils.ShapeBuilder; +import com.allen.library.helper.ShapeGradientAngle; +import com.allen.library.helper.ShapeBuilder; +import com.allen.library.helper.ShapeGradientType; +import com.allen.library.helper.ShapeType; +import com.allen.library.shape.ShapeLinearLayout; import com.allen.supertextview.utils.DisplayUtils; import com.bumptech.glide.Glide; import com.bumptech.glide.load.resource.drawable.GlideDrawable; @@ -74,7 +78,7 @@ protected void onCreate(Bundle savedInstanceState) { private void setShape1(SuperTextView stv) { stv .getShapeBuilder() - .setShapeGradientAngle(45) + .setShapeGradientAngle(ShapeGradientAngle.TL_BR) .setShapeGradientStartColor(getResources().getColor(R.color.colorPrimary)) .setShapeGradientEndColor(getResources().getColor(R.color.colorAccent)) .into(stv); @@ -83,13 +87,13 @@ private void setShape1(SuperTextView stv) { private void setShape2(SuperTextView stv) { ShapeBuilder shapeBuilder = new ShapeBuilder(); shapeBuilder - .setShapeType(ShapeBuilder.RECTANGLE) + .setShapeType(ShapeType.RECTANGLE) .setShapeCornersRadius(DisplayUtils.dip2px(this,25f)) .setShapeStrokeWidth(DisplayUtils.dip2px(this,2f)) .setShapeStrokeColor(Color.YELLOW) .setShapeStrokeDashWidth(DisplayUtils.dip2px(this,5f)) .setShapeStrokeDashGap(DisplayUtils.dip2px(this,2f)) - .setShapeGradientAngle(90) + .setShapeGradientAngle(ShapeGradientAngle.TR_BL) .setShapeGradientStartColor(getResources().getColor(R.color.colorPrimary)) .setShapeGradientEndColor(getResources().getColor(R.color.colorAccent)) .into(stv); diff --git a/app/src/main/res/drawable-xxhdpi/icon_iv_bg.png b/app/src/main/res/drawable-xxhdpi/icon_iv_bg.png new file mode 100644 index 0000000..e606417 Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/icon_iv_bg.png differ diff --git a/app/src/main/res/drawable/edit_cursor.xml b/app/src/main/res/drawable/edit_cursor.xml new file mode 100644 index 0000000..c530802 --- /dev/null +++ b/app/src/main/res/drawable/edit_cursor.xml @@ -0,0 +1,8 @@ + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index e5a50b2..c7cb7fd 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -94,15 +94,21 @@ android:id="@+id/super_button" android:layout_width="match_parent" android:layout_height="wrap_content" - android:background="@color/colorAccent" - android:text="超级按钮" - android:textColor="@color/white" /> + android:textAllCaps="false" + android:text="超级按钮(即将废弃，使用ShapeButton替代)" />