Skip to content

Fixed custom left-right padding #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
anton-knyazev merged 1 commit into from
Apr 2, 2018
Merged

Fixed custom left-right padding #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .idea/modules.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

23 changes: 18 additions & 5 deletions center_icon_button/src/main/java/com/omega_r/libs/OmegaCenterIconButton.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,23 +32,25 @@ public class OmegaCenterIconButton extends AppCompatButton {
private Rect textBoundsRect;
@ColorInt
private int tintColor = Color.TRANSPARENT;
private int mLeftPadding;
private int mRightPadding;

public OmegaCenterIconButton(Context context) {
super(context);
initDrawableTint(context, null);
init(context, null);
}

public OmegaCenterIconButton(Context context, AttributeSet attrs) {
super(context, attrs);
initDrawableTint(context, attrs);
init(context, attrs);
}

public OmegaCenterIconButton(Context context, AttributeSet attrs, int defStyleAttr) {
super(context, attrs, defStyleAttr);
initDrawableTint(context, attrs);
init(context, attrs);
}

private void initDrawableTint(Context context, AttributeSet attrs) {
private void init(Context context, AttributeSet attrs) {
if (attrs != null) {
TypedArray typedArray = context.obtainStyledAttributes(attrs, R.styleable.OmegaCenterIconButton);
tintColor = typedArray.getColor(R.styleable.OmegaCenterIconButton_drawableTint, Color.TRANSPARENT);
Expand All @@ -59,6 +61,8 @@ private void initDrawableTint(Context context, AttributeSet attrs) {
updateTint();
typedArray.recycle();
}
mLeftPadding = getPaddingLeft();
mRightPadding = getPaddingRight();
}

private void updateTint() {
Expand Down Expand Up @@ -107,6 +111,14 @@ private void updatePadding() {
updatePadding(getMeasuredWidth());
}

@Override
public void setPadding(int left, int top, int right, int bottom) {
super.setPadding(left, top, right, bottom);
mLeftPadding = left;
mRightPadding = right;
updatePadding();
}

private void updatePadding(int width) {
if (width == 0) return;

Expand All @@ -129,7 +141,8 @@ private void updatePadding(int width) {
paddingSize = (width - rightDrawable.getIntrinsicWidth() - iconPadding * 2 - textWidth) / 2;
}

setPadding(paddingSize, getPaddingTop(), paddingSize, getPaddingBottom());

super.setPadding(Math.max(mLeftPadding, paddingSize), getPaddingTop(), Math.max(paddingSize, mRightPadding), getPaddingBottom());
}

private int getTextWidth() {
Expand Down