Skip to content

Commit 8781599

Browse files
committed
Small refactor and bug fixes.
1 parent 12ecd17 commit 8781599

File tree

1 file changed

+19
-2
lines changed

1 file changed

+19
-2
lines changed

library/src/main/java/pl/sigmapoint/customview/CustomButton.java

Lines changed: 19 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -434,6 +434,11 @@ public void setTextSize(float size) {
434434
textView.setTextSize(size);
435435
}
436436

437+
public void setTextParams(int weight, int[] padding) {
438+
this.textWeight = weight;
439+
this.textPaddingArray = padding;
440+
}
441+
437442
/**
438443
* Set text view padding
439444
*
@@ -453,12 +458,14 @@ public void setTextPadding(int[] padding) {
453458
* @param scaleType all without MATRIX
454459
* @param padding 4 elements array {CustomButton.LEFT, CustomButton.TOP, CustomButton.RIGHT, CustomButton.BOTTOM}
455460
*/
456-
public void setImage(int position, Drawable drawableNormal, Drawable drawablePressed, Drawable drawableDisabled, ImageView.ScaleType scaleType, int[] padding) {
461+
public void setImage(int position, Drawable drawableNormal, Drawable drawablePressed, Drawable drawableDisabled, ImageView.ScaleType scaleType, int weight, int[] padding) {
457462
this.drawableDisabled = drawableDisabled;
458463
this.drawablePressed = drawablePressed;
459464
this.drawableNormal = drawableNormal;
460465
this.drawablePosition = position;
461466
this.imageScaleType = scaleType;
467+
this.imageWeight = weight;
468+
this.imagePaddingArray = padding;
462469

463470
if (padding != null)
464471
imageContainer.setPadding(padding[LEFT], padding[TOP], padding[RIGHT], padding[BOTTOM]);
@@ -476,9 +483,11 @@ public void setImage(int position, Drawable drawableNormal, Drawable drawablePre
476483
* @param scaleType all without MATRIX
477484
* @param padding 4 elements array {CustomButton.LEFT, CustomButton.TOP, CustomButton.RIGHT, CustomButton.BOTTOM}
478485
*/
479-
public void setImage(int position, Drawable drawable, ImageView.ScaleType scaleType, int[] padding) {
486+
public void setImage(int position, Drawable drawable, ImageView.ScaleType scaleType, int weight, int[] padding) {
480487
this.drawable = drawable;
481488
this.drawablePosition = position;
489+
this.imageWeight = weight;
490+
this.imagePaddingArray = padding;
482491

483492
if (padding != null)
484493
imageContainer.setPadding(padding[LEFT], padding[TOP], padding[RIGHT], padding[BOTTOM]);
@@ -646,4 +655,12 @@ public int[] getImagePaddingArray() {
646655
public ImageView.ScaleType getImageScaleType() {
647656
return imageScaleType;
648657
}
658+
659+
public int getImageWeight() {
660+
return imageWeight;
661+
}
662+
663+
public int getTextWeight() {
664+
return textWeight;
665+
}
649666
}

0 commit comments

Comments
 (0)