Android-builders-club/OsmAnd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fix setupDialogButton

Browse source
This commit is contained in:
Nazar 2019-10-07 16:23:27 +03:00
parent 0a7e416fb7
commit 86d5bea322
1 changed files with 10 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
OsmAnd/src/net/osmand/plus/UiUtilities.java
View file

@ -357,14 +357,16 @@ public class UiUtilities {
textAndIconColorResId = nightMode ? R.color.dlg_btn_secondary_text_dark : R.color.dlg_btn_secondary_text_light;
break;
}
ColorStateList colorStateList = ContextCompat.getColorStateList(ctx, textAndIconColorResId);
buttonTextView.setText(buttonText);
buttonTextView.setTextColor(colorStateList);
buttonTextView.setEnabled(buttonView.isEnabled());
if (iconResId != INVALID_ID) {
Drawable icon = tintDrawable(ContextCompat.getDrawable(ctx, iconResId), ContextCompat.getColor(ctx, textAndIconColorResId));
buttonTextView.setCompoundDrawablesWithIntrinsicBounds(icon, null, null, null);
buttonTextView.setCompoundDrawablePadding(AndroidUtils.dpToPx(ctx, ctx.getResources().getDimension(R.dimen.content_padding_half)));
if (textAndIconColorResId != INVALID_ID) {
ColorStateList colorStateList = ContextCompat.getColorStateList(ctx, textAndIconColorResId);
buttonTextView.setText(buttonText);
buttonTextView.setTextColor(colorStateList);
buttonTextView.setEnabled(buttonView.isEnabled());
if (iconResId != INVALID_ID) {
Drawable icon = tintDrawable(ContextCompat.getDrawable(ctx, iconResId), ContextCompat.getColor(ctx, textAndIconColorResId));
buttonTextView.setCompoundDrawablesWithIntrinsicBounds(icon, null, null, null);
buttonTextView.setCompoundDrawablePadding(AndroidUtils.dpToPx(ctx, ctx.getResources().getDimension(R.dimen.content_padding_half)));
}
}
}