fix issue #23, #17. 支持自定义进度条圆角

Author: JinJieGu

README.md

@@ -31,6 +31,7 @@ rsb_seekBarHeight|dimension|The height of the progress bar
 rsb_thumbSize|dimension|The size of the button
 rsb_cellMode|enum|Scale mode **number** according to the scale of the actual proportion of the distribution of the location *（markTextArray must be a number）* **other** bisects the current layout*（markTextArray can be any character）*
 rsb_seekBarMode| enum |One-way, two-way mode **single** like normal seekbar **range** Bidirectional selection SeekBar
+rsb_thumbRadius|dimension|The radius of the progress bar
 
 ## Usage
 
@@ -45,7 +46,7 @@ rsb_seekBarMode| enum |One-way, two-way mode **single** like normal seekbar **ra
 	}
 
 	dependencies {
-	        compile 'com.github.Jay-Goo:RangeSeekBar:v1.2.0'
+	        compile 'com.github.Jay-Goo:RangeSeekBar:v1.2.1'
 	}
 
 ```
@@ -79,6 +80,7 @@ v1.0.7 | set the seekbar gravity center to make the layout  easier
 v1.0.8 | fix issue #2, #3
 v1.1.0 | add progressHintMode and some color attrs setter
 v1.2.0 | thumbResId support custom drawable；Property name refactoring to prevent naming conflicts；adjust rsb_progressHintMode，add onStopTrackingTouch，onStartTrackingTouch Listeners
+v1.2.1 | fix issue #23, #17. add radius of progress
 
 ## [Blog](http://blog.csdn.net/google_acmer/article/details/54971421)
 

README_ZH.md

@@ -27,6 +27,7 @@ rsb_seekBarHeight|dimension|进度条的高度
 rsb_thumbSize|dimension|按钮的尺寸
 rsb_cellMode|enum|刻度模式 **number** 根据刻度的实际所占比例分配位置*（markTextArray中必须都为数字）* **other** 平分当前布局*（markTextArray可以是任何字符）*
 rsb_seekBarMode| enum |单向、双向模式 **single** 单向模式，只有一个按钮 **range** 双向模式，有两个按钮
+rsb_thumbRadius|dimension|进度条圆角
 
 ## Usage
 
@@ -41,7 +42,7 @@ rsb_seekBarMode| enum |单向、双向模式 **single** 单向模式，只有一
 	}
 
 	dependencies {
-	        compile 'com.github.Jay-Goo:RangeSeekBar:v1.2.0'
+	        compile 'com.github.Jay-Goo:RangeSeekBar:v1.2.1'
 	}
 
 ```
@@ -74,6 +75,7 @@ v1.0.7 | 令seekbar布局居中，让你的布局和其他布局配合更简单
 v1.0.8 | 修复issue #2，#3
 v1.1.0 | 添加进度提示模式属性，添加color 属性setter
 v1.2.0 | thumbResId支持自定义drawable；属性名重构，防止命名冲突；调整rsb_progressHintMode，新增onStopTrackingTouch，onStartTrackingTouch Listeners
+v1.2.1 | fix issue #23, #17. 支持自定义进度条圆角
 
 ## [博客讲解](http://blog.csdn.net/google_acmer/article/details/54971421)
 

RangeSeekBar/src/main/java/com/jaygoo/widget/RangeSeekBar.java

@@ -85,9 +85,12 @@ public class RangeSeekBar extends View {
     private int mCursorTextHeight;
     private int mPartLength;
     private int heightNeeded;
-    private int lineCorners;
     private int lineWidth;
 
+    //进度条圆角
+    //radius of progress bar
+    private float lineRadius;
+
     //选择过的进度条颜色
     // the color of the selected progress bar
     private int colorLineSelected;
@@ -136,7 +139,8 @@ public class RangeSeekBar extends View {
     private Paint mMainPaint = new Paint();
     private Paint mCursorPaint = new Paint();
     private Paint mProgressPaint;
-    private RectF line = new RectF();
+    private RectF backgroundLineRect = new RectF();
+    private RectF foregroundLineRect = new RectF();
     private SeekBar leftSB ;
     private SeekBar rightSB;
     private SeekBar currTouch;
@@ -172,6 +176,7 @@ public RangeSeekBar(Context context, AttributeSet attrs) {
         mThumbSize = (int)t.getDimension(R.styleable.RangeSeekBar_rsb_thumbSize,dp2px(context,26));
         mCellMode = t.getInt(R.styleable.RangeSeekBar_rsb_cellMode , 0);
         mSeekBarMode = t.getInt(R.styleable.RangeSeekBar_rsb_seekBarMode , 2);
+        lineRadius = (int)t.getDimension(R.styleable.RangeSeekBar_rsb_lineRadius,-1);
 
         if (mSeekBarMode == 2){
             leftSB = new SeekBar(-1);
@@ -205,8 +210,8 @@ public RangeSeekBar(Context context, AttributeSet attrs) {
         //Android7.0以上：onMeasure--->onSizeChanged
         lineTop = (int)mHintBGHeight + mThumbSize/2 -mSeekBarHeight/2 ;
         lineBottom = lineTop + mSeekBarHeight ;
-        lineCorners = (int) ((lineBottom - lineTop) * 0.45f);
-
+        //default value
+        if (lineRadius < 0) lineRadius = (int) ((lineBottom - lineTop) * 0.45f);
     }
 
     @Override
@@ -242,7 +247,7 @@ protected void onSizeChanged(int w, int h, int oldw, int oldh) {
         lineLeft = DEFAULT_PADDING_LEFT_AND_RIGHT  + getPaddingLeft();
         lineRight = w - lineLeft - getPaddingRight();
         lineWidth = lineRight - lineLeft;
-        line.set(lineLeft, lineTop, lineRight, lineBottom);
+        backgroundLineRect.set(lineLeft, lineTop, lineRight, lineBottom);
 
         leftSB.onSizeChanged(lineLeft, lineBottom, mThumbSize, lineWidth, cellsCount > 1, mThumbResId, getContext());
         if (mSeekBarMode == 2) {
@@ -286,14 +291,22 @@ protected void onDraw(Canvas canvas) {
         //绘制进度条
         // draw the progress bar
         mMainPaint.setColor(colorLineEdge);
-        canvas.drawRoundRect(line, lineCorners, lineCorners, mMainPaint);
+
+        canvas.drawRoundRect(backgroundLineRect, lineRadius, lineRadius, mMainPaint);
         mMainPaint.setColor(colorLineSelected);
+
         if (mSeekBarMode == 2) {
-            canvas.drawRect(leftSB.left + leftSB.widthSize / 2 + leftSB.lineWidth * leftSB.currPercent, lineTop,
-                    rightSB.left + rightSB.widthSize / 2 + rightSB.lineWidth * rightSB.currPercent, lineBottom, mMainPaint);
+            foregroundLineRect.top = lineTop;
+            foregroundLineRect.left = leftSB.left + leftSB.widthSize / 2 + leftSB.lineWidth * leftSB.currPercent;
+            foregroundLineRect.right = rightSB.left + rightSB.widthSize / 2 + rightSB.lineWidth * rightSB.currPercent;
+            foregroundLineRect.bottom = lineBottom;
+            canvas.drawRoundRect(foregroundLineRect, lineRadius, lineRadius, mMainPaint);
         }else {
-            canvas.drawRect(leftSB.left + leftSB.widthSize / 2 , lineTop,
-                    leftSB.left + leftSB.widthSize / 2 + leftSB.lineWidth * leftSB.currPercent, lineBottom, mMainPaint);
+            foregroundLineRect.top = lineTop;
+            foregroundLineRect.left = leftSB.left + leftSB.widthSize / 2 ;
+            foregroundLineRect.right = leftSB.left + leftSB.widthSize / 2 + leftSB.lineWidth * leftSB.currPercent;
+            foregroundLineRect.bottom = lineBottom;
+            canvas.drawRoundRect(foregroundLineRect, lineRadius, lineRadius, mMainPaint);
         }
         if (mProgressHintMode == HINT_MODE_ALWAYS_SHOW){
             isShowProgressHint(leftSB, true);
@@ -455,7 +468,7 @@ protected void draw(Canvas canvas) {
             if (hintW < 1.5f * hintH) hintW = (int)(1.5f * hintH);
 
             if (bmp != null) {
-                canvas.drawBitmap(bmp, left, lineTop - bmp.getHeight() / 2, null);
+                canvas.drawBitmap(bmp, left,  lineTop + (mSeekBarHeight - bmp.getHeight()) / 2, null);
                 if (isShowingHint) {
 
                     Rect rect = new Rect();

RangeSeekBar/src/main/res/values/attrs.xml

@@ -27,6 +27,7 @@
     other 平分当前布局（markTextArray可以是任何字符）
     -->
     <!--单向、双向模式 single 单向模式，只有一个按钮 range 双向模式，有两个按钮 -->
+    <!--进度条圆角-->
 
     <!-- ******************** 参数解释 ******************** -->
 
@@ -61,7 +62,7 @@
     Other bisects the current layout (markTextArray can be any character)
     -->
     <!--One-way, two-way mode single one-way mode, there is only one button range bidirectional mode, two buttons -->
-
+    <!--the radius of progressbar-->
     <!-- ******************** Parameter Explanation ******************** -->
 
 
@@ -100,6 +101,6 @@
             <enum name="single" value="1"/>
             <enum name="range" value="2"/>
         </attr>
-
+        <attr name="rsb_lineRadius" format="dimension"/>
     </declare-styleable>
 </resources>

app/src/main/res/layout/activity_main.xml

@@ -77,13 +77,13 @@
         app:rsb_lineColorEdge="@color/colorSeekBarDefault"
         app:rsb_textPadding="17dp"
         app:rsb_cells="4"
-        app:rsb_progressHintMode="alwaysHide"
         app:rsb_textSize="12sp"
-        app:rsb_hintBGHeight="28dp"
-        app:rsb_seekBarHeight="8dp"
+        app:rsb_hintBGHeight="38dp"
+        app:rsb_seekBarHeight="4dp"
         app:rsb_thumbSize="26dp"
         app:rsb_cellMode="other"
         app:rsb_seekBarMode="single"
+        app:rsb_lineRadius="0dp"
         />
 
 </LinearLayout>