empathicqubit/Signal-Android
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Fix aspect ratio with info icon on API 21 devices.

Browse source
This commit is contained in:
Alex Hart 2021-04-07 16:46:38 -03:00 • committed by Alan Evans
parent f400504898
commit 1aa8e9753d
1 changed files with 7 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
app/src/main/java/org/thoughtcrime/securesms/payments/create/CreatePaymentFragment.java
View file

@ -66,6 +66,7 @@ public class CreatePaymentFragment extends LoggingFragment {
private View addNote; private View addNote;
private View toggle; private View toggle;
private Drawable infoIcon; private Drawable infoIcon;
private Drawable spacer;
private ConstraintSet cryptoConstraintSet; private ConstraintSet cryptoConstraintSet;
private ConstraintSet fiatConstraintSet; private ConstraintSet fiatConstraintSet;
@ -147,16 +148,13 @@ public class CreatePaymentFragment extends LoggingFragment {
} }
private void initializeInfoIcon() { private void initializeInfoIcon() {
Drawable pad = Objects.requireNonNull(AppCompatResources.getDrawable(requireContext(), R.drawable.payment_info_pad)); spacer = Objects.requireNonNull(AppCompatResources.getDrawable(requireContext(), R.drawable.payment_info_pad));
Drawable info = Objects.requireNonNull(AppCompatResources.getDrawable(requireContext(), R.drawable.ic_update_info_16)); infoIcon = Objects.requireNonNull(AppCompatResources.getDrawable(requireContext(), R.drawable.ic_update_info_16));
DrawableCompat.setTint(info, exchange.getCurrentTextColor()); DrawableCompat.setTint(infoIcon, exchange.getCurrentTextColor());
pad.setBounds(0, 0, ViewUtil.dpToPx(29), ViewUtil.dpToPx(16)); spacer.setBounds(0, 0, ViewUtil.dpToPx(13), ViewUtil.dpToPx(16));
info.setBounds(0, 0, ViewUtil.dpToPx(16), ViewUtil.dpToPx(16)); infoIcon.setBounds(0, 0, ViewUtil.dpToPx(16), ViewUtil.dpToPx(16));
infoIcon = new LayerDrawable(new Drawable[]{pad, info});
infoIcon.setBounds(0, 0, ViewUtil.dpToPx(29), ViewUtil.dpToPx(16));
} }
private void updateNote(@Nullable CharSequence note) { private void updateNote(@Nullable CharSequence note) {
@ -195,6 +193,7 @@ public class CreatePaymentFragment extends LoggingFragment {
if (inputState.getFiatMoney().isPresent()) { if (inputState.getFiatMoney().isPresent()) {
exchange.setVisibility(View.VISIBLE); exchange.setVisibility(View.VISIBLE);
exchange.setText(FiatMoneyUtil.format(getResources(), inputState.getFiatMoney().get(), FiatMoneyUtil.formatOptions().withDisplayTime(true))); exchange.setText(FiatMoneyUtil.format(getResources(), inputState.getFiatMoney().get(), FiatMoneyUtil.formatOptions().withDisplayTime(true)));
exchange.append(SpanUtil.buildImageSpan(spacer));
exchange.append(SpanUtil.buildImageSpan(infoIcon)); exchange.append(SpanUtil.buildImageSpan(infoIcon));
toggle.setVisibility(View.VISIBLE); toggle.setVisibility(View.VISIBLE);
toggle.setEnabled(true); toggle.setEnabled(true);