Skip to content

Commit

Permalink
抽取 ShapeDrawable 为独立框架
Browse files Browse the repository at this point in the history 
优化 ShapeView 部分属性命名
  • Loading branch information
@getActivity
getActivity committed Jul 24, 2023
1 parent b6b4707 commit 6fb7eeb
Show file tree
Hide file tree
Showing 30 changed files with 477 additions and 1,916 deletions.
10 changes: 5 additions & 5 deletions Adaptive.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,17 +24,17 @@

* 修改 `app:shape_bottomRightRadius` 属性名，请使用 `app:shape_radiusInBottomRight` 代替

* 修改 `app:shape_startColor` 属性名，请使用 `app:shape_solidStartColor` 代替
* 修改 `app:shape_startColor` 属性名，请使用 `app:shape_solidGradientStartColor` 代替

* 修改 `app:shape_centerColor` 属性名，请使用 `app:shape_solidStartColor` 代替
* 修改 `app:shape_centerColor` 属性名，请使用 `app:shape_solidGradientStartColor` 代替

* 修改 `app:shape_endColor` 属性名，请使用 `app:shape_solidEndColor` 代替
* 修改 `app:shape_endColor` 属性名，请使用 `app:shape_solidGradientEndColor` 代替

* 修改 `app:shape_gradientType` 属性名，请使用 `app:shape_solidGradientType` 代替

* 修改 `app:shape_centerX` 属性名，请使用 `app:shape_solidCenterX` 代替
* 修改 `app:shape_centerX` 属性名，请使用 `app:shape_solidGradientCenterX` 代替

* 修改 `app:shape_centerY` 属性名，请使用 `app:shape_solidCenterY` 代替
* 修改 `app:shape_centerY` 属性名，请使用 `app:shape_solidGradientCenterY` 代替

* 修改 `app:shape_gradientRadius` 属性名，请使用 `app:shape_solidGradientRadius` 代替

Expand Down
20 changes: 11 additions & 9 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,10 @@ android {
}
dependencies {
// Shape 框架：https://github.com/getActivity/ShapeView
// ShapeView：https://github.com/getActivity/ShapeView
implementation 'com.github.getActivity:ShapeView:9.0'
// ShapeDrawable：https://github.com/getActivity/ShapeDrawable
implementation 'com.github.getActivity:ShapeDrawable:3.0'
}
```

Expand Down Expand Up @@ -150,11 +152,11 @@ shapeButton.setOnClickListener(new View.OnClickListener() {
<attr name="shape_solidSelectedColor" format="color" />

<!-- 填充色渐变色起始颜色 -->
<attr name="shape_solidStartColor" format="color" />
<attr name="shape_solidGradientStartColor" format="color" />
<!-- 填充色渐变色中间颜色（可不设置） -->
<attr name="shape_solidCenterColor" format="color" />
<attr name="shape_solidGradientCenterColor" format="color" />
<!-- 填充色渐变色结束颜色 -->
<attr name="shape_solidEndColor" format="color" />
<attr name="shape_solidGradientEndColor" format="color" />

<!-- 填充色渐变方向（仅用于线性渐变。必须是 0-315 范围内的值，并且是 45 的倍数） -->
<attr name="shape_solidGradientOrientation" >
Expand Down Expand Up @@ -186,9 +188,9 @@ shapeButton.setOnClickListener(new View.OnClickListener() {
<enum name="sweep" value="2" />
</attr>
<!-- 填充色渐变中心 X 点坐标的相对位置（默认值为 0.5）-->
<attr name="shape_solidCenterX" format="float|fraction" />
<attr name="shape_solidGradientCenterX" format="float|fraction" />
<!-- 填充色渐变中心 Y 点坐标的相对位置（默认值为 0.5）-->
<attr name="shape_solidCenterY" format="float|fraction" />
<attr name="shape_solidGradientCenterY" format="float|fraction" />
<!-- 填充色渐变色半径（仅用于径向渐变） -->
<attr name="shape_solidGradientRadius" format="float|fraction|dimension" />

Expand All @@ -206,11 +208,11 @@ shapeButton.setOnClickListener(new View.OnClickListener() {
<attr name="shape_strokeSelectedColor" format="color" />

<!-- 边框色渐变色起始颜色 -->
<attr name="shape_strokeStartColor" format="color" />
<attr name="shape_strokeGradientStartColor" format="color" />
<!-- 边框渐变色中间颜色（可不设置） -->
<attr name="shape_strokeCenterColor" format="color" />
<attr name="shape_strokeGradientCenterColor" format="color" />
<!-- 边框渐变色结束颜色 -->
<attr name="shape_strokeEndColor" format="color" />
<attr name="shape_strokeGradientColor" format="color" />

<!-- 边框色渐变方向（必须是 0-315 范围内的值，并且是 45 的倍数） -->
<attr name="shape_strokeGradientOrientation" >
Expand Down
112 changes: 56 additions & 56 deletions UseDemo.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -79,8 +79,8 @@
android:textColor="@android:color/black"
android:textSize="14sp"
app:shape_radius="20dp"
app:shape_solidEndColor="#ED58FF"
app:shape_solidStartColor="#49DAFA"
app:shape_solidGradientEndColor="#ED58FF"
app:shape_solidGradientStartColor="#49DAFA"
app:shape_strokeColor="#000000"
app:shape_strokeSize="1dp"
app:shape_type="rectangle" />
Expand Down Expand Up @@ -116,10 +116,10 @@
android:textColor="@android:color/white"
android:textSize="14sp"
app:shape_radius="20dp"
app:shape_solidEndColor="#ED58FF"
app:shape_solidGradientEndColor="#ED58FF"
app:shape_solidGradientOrientation="topToBottom"
app:shape_solidPressedColor="#5A8DDF"
app:shape_solidStartColor="#49DAFA"
app:shape_solidGradientStartColor="#49DAFA"
app:shape_type="rectangle" />

<com.hjq.shape.view.ShapeButton
Expand All @@ -133,11 +133,11 @@
android:textColor="@android:color/black"
android:textSize="14sp"
app:shape_radius="20dp"
app:shape_strokeEndColor="#f08833"
app:shape_strokeGradientColor="#f08833"
app:shape_strokeGradientOrientation="topToBottom"
app:shape_strokePressedColor="@android:color/black"
app:shape_strokeSize="2dp"
app:shape_strokeStartColor="#fefa54"
app:shape_strokeGradientStartColor="#fefa54"
app:shape_type="rectangle" />

<com.hjq.shape.view.ShapeButton
Expand All @@ -151,15 +151,15 @@
android:textColor="@android:color/white"
android:textSize="14sp"
app:shape_radius="20dp"
app:shape_solidEndColor="#ED58FF"
app:shape_solidGradientEndColor="#ED58FF"
app:shape_solidGradientOrientation="topToBottom"
app:shape_solidPressedColor="#5A8DDF"
app:shape_solidStartColor="#49DAFA"
app:shape_strokeEndColor="#f08833"
app:shape_solidGradientStartColor="#49DAFA"
app:shape_strokeGradientColor="#f08833"
app:shape_strokeGradientOrientation="topToBottom"
app:shape_strokePressedColor="@android:color/black"
app:shape_strokeSize="2dp"
app:shape_strokeStartColor="#fefa54"
app:shape_strokeGradientStartColor="#fefa54"
app:shape_type="rectangle" />
```

Expand Down Expand Up @@ -304,8 +304,8 @@
app:shape_radius="10dp"
app:shape_shadowColor="#99000000"
app:shape_shadowSize="10dp"
app:shape_solidEndColor="#f08833"
app:shape_solidStartColor="#fefa54"
app:shape_solidGradientEndColor="#f08833"
app:shape_solidGradientStartColor="#fefa54"
app:shape_type="rectangle" />
```

Expand Down Expand Up @@ -544,12 +544,12 @@
android:text="矩形-垂直线性渐变"
android:textColor="@android:color/black"
android:textSize="14sp"
app:shape_solidCenterColor="#8000ff00"
app:shape_solidCenterX="0.5"
app:shape_solidCenterY="0.4"
app:shape_solidEndColor="#1000ff00"
app:shape_solidGradientCenterColor="#8000ff00"
app:shape_solidGradientCenterX="0.5"
app:shape_solidGradientCenterY="0.4"
app:shape_solidGradientEndColor="#1000ff00"
app:shape_solidGradientOrientation="topToBottom"
app:shape_solidStartColor="#ff00ff00"
app:shape_solidGradientStartColor="#ff00ff00"
app:shape_strokeColor="#ffff0000"
app:shape_strokeSize="1dp"
app:shape_type="rectangle" />
Expand All @@ -563,12 +563,12 @@
android:text="矩形-水平线性渐变"
android:textColor="@android:color/black"
android:textSize="14sp"
app:shape_solidCenterColor="#8000ff00"
app:shape_solidCenterX="0.5"
app:shape_solidCenterY="0.5"
app:shape_solidEndColor="#ff00ff00"
app:shape_solidGradientCenterColor="#8000ff00"
app:shape_solidGradientCenterX="0.5"
app:shape_solidGradientCenterY="0.5"
app:shape_solidGradientEndColor="#ff00ff00"
app:shape_solidGradientOrientation="leftToRight"
app:shape_solidStartColor="#1000ff00"
app:shape_solidGradientStartColor="#1000ff00"
app:shape_strokeColor="#ffff0000"
app:shape_strokeSize="1dp"
app:shape_type="rectangle" />
Expand All @@ -582,12 +582,12 @@
android:text="矩形-对角线线性渐变"
android:textColor="@android:color/black"
android:textSize="14sp"
app:shape_solidCenterColor="#8000ff00"
app:shape_solidCenterX="0.5"
app:shape_solidCenterY="0.5"
app:shape_solidEndColor="#1000ff00"
app:shape_solidGradientCenterColor="#8000ff00"
app:shape_solidGradientCenterX="0.5"
app:shape_solidGradientCenterY="0.5"
app:shape_solidGradientEndColor="#1000ff00"
app:shape_solidGradientOrientation="bottomLeftToTopRight"
app:shape_solidStartColor="#ff00ff00"
app:shape_solidGradientStartColor="#ff00ff00"
app:shape_strokeColor="#ffff0000"
app:shape_strokeSize="1dp"
app:shape_type="rectangle" />
Expand All @@ -601,13 +601,13 @@
android:text="矩形-径向渐变"
android:textColor="@android:color/black"
android:textSize="14sp"
app:shape_solidCenterX="0.5"
app:shape_solidCenterY="0.5"
app:shape_solidEndColor="#ff00ff00"
app:shape_solidGradientCenterX="0.5"
app:shape_solidGradientCenterY="0.5"
app:shape_solidGradientEndColor="#ff00ff00"
app:shape_solidGradientOrientation="leftToRight"
app:shape_solidGradientRadius="20dp"
app:shape_solidGradientType="radial"
app:shape_solidStartColor="#0000ff00"
app:shape_solidGradientStartColor="#0000ff00"
app:shape_strokeColor="#ffff0000"
app:shape_strokeSize="1dp"
app:shape_type="rectangle" />
Expand All @@ -621,12 +621,12 @@
android:text="矩形-扫描渐变"
android:textColor="@android:color/black"
android:textSize="14sp"
app:shape_solidCenterX="0.5"
app:shape_solidCenterY="0.5"
app:shape_solidEndColor="#0000ff00"
app:shape_solidGradientCenterX="0.5"
app:shape_solidGradientCenterY="0.5"
app:shape_solidGradientEndColor="#0000ff00"
app:shape_solidGradientOrientation="leftToRight"
app:shape_solidGradientType="sweep"
app:shape_solidStartColor="#ff00ff00"
app:shape_solidGradientStartColor="#ff00ff00"
app:shape_strokeColor="#ffff0000"
app:shape_strokeSize="1dp"
app:shape_type="rectangle" />
Expand Down Expand Up @@ -683,13 +683,13 @@
android:text="圆-线性渐变"
android:textColor="@android:color/black"
android:textSize="14sp"
app:shape_solidCenterColor="#80ff0000"
app:shape_solidCenterX="0.5"
app:shape_solidCenterY="0.8"
app:shape_solidEndColor="#ffff0000"
app:shape_solidGradientCenterColor="#80ff0000"
app:shape_solidGradientCenterX="0.5"
app:shape_solidGradientCenterY="0.8"
app:shape_solidGradientEndColor="#ffff0000"
app:shape_solidGradientOrientation="topToBottom"
app:shape_solidGradientType="linear"
app:shape_solidStartColor="#00ff0000"
app:shape_solidGradientStartColor="#00ff0000"
app:shape_type="oval" />

<com.hjq.shape.view.ShapeTextView
Expand All @@ -701,13 +701,13 @@
android:text="圆-径向渐变"
android:textColor="@android:color/black"
android:textSize="14sp"
app:shape_solidCenterColor="#80ff0000"
app:shape_solidCenterX="0.5"
app:shape_solidCenterY="0.5"
app:shape_solidEndColor="#10ff0000"
app:shape_solidGradientCenterColor="#80ff0000"
app:shape_solidGradientCenterX="0.5"
app:shape_solidGradientCenterY="0.5"
app:shape_solidGradientEndColor="#10ff0000"
app:shape_solidGradientRadius="80dp"
app:shape_solidGradientType="radial"
app:shape_solidStartColor="#ffff0000"
app:shape_solidGradientStartColor="#ffff0000"
app:shape_type="oval" />

<com.hjq.shape.view.ShapeTextView
Expand All @@ -719,13 +719,13 @@
android:text="圆-扫描渐变"
android:textColor="@android:color/black"
android:textSize="14sp"
app:shape_solidCenterColor="#80ff0000"
app:shape_solidCenterX="0.5"
app:shape_solidCenterY="0.6"
app:shape_solidEndColor="#20ff0000"
app:shape_solidGradientCenterColor="#80ff0000"
app:shape_solidGradientCenterX="0.5"
app:shape_solidGradientCenterY="0.6"
app:shape_solidGradientEndColor="#20ff0000"
app:shape_solidGradientRadius="20dp"
app:shape_solidGradientType="sweep"
app:shape_solidStartColor="#ffff0000"
app:shape_solidGradientStartColor="#ffff0000"
app:shape_type="oval" />
```

Expand Down Expand Up @@ -788,11 +788,11 @@
android:textSize="14sp"
app:shape_ringInnerRadiusRatio="4"
app:shape_ringThicknessRatio="4"
app:shape_solidCenterColor="#80ff0000"
app:shape_solidEndColor="#ffff0000"
app:shape_solidGradientCenterColor="#80ff0000"
app:shape_solidGradientEndColor="#ffff0000"
app:shape_solidGradientOrientation="bottomLeftToTopRight"
app:shape_solidGradientType="linear"
app:shape_solidStartColor="#00ff0000"
app:shape_solidGradientStartColor="#00ff0000"
app:shape_type="ring" />

<com.hjq.shape.view.ShapeTextView
Expand All @@ -806,10 +806,10 @@
android:textSize="14sp"
app:shape_ringInnerRadiusRatio="4"
app:shape_ringThicknessRatio="4"
app:shape_solidCenterColor="#80ff0000"
app:shape_solidEndColor="#00ff0000"
app:shape_solidGradientCenterColor="#80ff0000"
app:shape_solidGradientEndColor="#00ff0000"
app:shape_solidGradientType="sweep"
app:shape_solidStartColor="#ffff0000"
app:shape_solidGradientStartColor="#ffff0000"
app:shape_type="ring" />
```

Expand Down
Loading

0 comments on commit 6fb7eeb

Please sign in to comment.