Skip to content

Commit ec4860d

Browse files
committed
fix #32,#31,#9
1 parent 8407af1 commit ec4860d

File tree

3 files changed

+14
-6
lines changed

3 files changed

+14
-6
lines changed

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
import android.graphics.Canvas;
66
import android.graphics.Paint;
77
import android.graphics.RectF;
8+
import android.graphics.Typeface;
89
import android.os.Parcelable;
9-
import android.support.v4.content.ContextCompat;
1010
import android.util.AttributeSet;
1111
import android.view.MotionEvent;
1212
import android.view.View;
@@ -276,7 +276,6 @@ private void initPaint() {
276276
paint.setTextSize(tickMarkTextSize);
277277
}
278278

279-
280279
public void setValue(float min, float max) {
281280
min = min + offsetValue;
282281
max = max + offsetValue;
@@ -399,20 +398,19 @@ public SeekBarState[] getRangeSeekBarState() {
399398
}
400399

401400
SeekBarState rightSeekBarState = new SeekBarState();
402-
rightSeekBarState.value = range;
403401
if (rightSB != null) {
402+
rightSeekBarState.value = -offsetValue + minPositiveValue + range * rightSB.currPercent;
404403
if (tickMarkNumber > 1){
405404
int index = (int)Math.floor(rightSB.currPercent * tickMarkNumber);
406405
if (tickMarkTextArray != null && index >= 0 && index < tickMarkTextArray.length) {
407-
leftSeekBarState.indicatorText = tickMarkTextArray[index].toString();
406+
rightSeekBarState.indicatorText = tickMarkTextArray[index].toString();
408407
}
409408
if (index == 0){
410409
rightSeekBarState.isMin = true;
411410
}else if (index == tickMarkNumber){
412411
rightSeekBarState.isMax = true;
413412
}
414413
}else {
415-
rightSeekBarState.value = - offsetValue + minPositiveValue + range * rightSB.currPercent;
416414
rightSeekBarState.indicatorText = (new StringBuffer().append(rightSeekBarState.value)).toString();
417415
if (Utils.compareFloat(rightSB.currPercent, 0f) == 0){
418416
rightSeekBarState.isMin = true;
@@ -878,5 +876,7 @@ public void setSeekBarMode(int seekBarMode) {
878876
this.seekBarMode = seekBarMode;
879877
}
880878

881-
879+
public void setTypeface(Typeface typeFace){
880+
paint.setTypeface(typeFace);
881+
}
882882
}

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
import android.graphics.Paint;
1414
import android.graphics.Path;
1515
import android.graphics.Rect;
16+
import android.graphics.Typeface;
1617
import android.support.v4.content.ContextCompat;
1718
import android.util.AttributeSet;
1819

@@ -513,5 +514,9 @@ protected void setActivate(boolean activate) {
513514
isActivate = activate;
514515
}
515516

517+
public void setTypeface(Typeface typeFace){
518+
paint.setTypeface(typeFace);
519+
}
520+
516521

517522
}

app/src/main/java/com/jaygoo/demo/MainActivity.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package com.jaygoo.demo;
22

33
import android.content.Intent;
4+
import android.graphics.Typeface;
45
import android.support.v7.app.AppCompatActivity;
56
import android.os.Bundle;
67
import android.util.Log;
@@ -22,6 +23,8 @@ protected void onCreate(Bundle savedInstanceState) {
2223
setContentView(R.layout.activity_main);
2324
initView();
2425
seekbar1.setValue(90);
26+
seekbar2.setTypeface(Typeface.DEFAULT_BOLD);
27+
seekbar2.getLeftSeekBar().setTypeface(Typeface.DEFAULT_BOLD);
2528
seekbar2.setValue(-0.5f,0.8f);
2629
seekbar2.setIndicatorTextDecimalFormat("0.00");
2730
seekbar4.setIndicatorTextDecimalFormat("0");

0 commit comments

Comments
 (0)