From 1aa8e9753db98b3d2f05d2f5fc320bed5bb91101 Mon Sep 17 00:00:00 2001 From: Alex Hart Date: Wed, 7 Apr 2021 16:46:38 -0300 Subject: [PATCH] Fix aspect ratio with info icon on API 21 devices. --- .../payments/create/CreatePaymentFragment.java | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/app/src/main/java/org/thoughtcrime/securesms/payments/create/CreatePaymentFragment.java b/app/src/main/java/org/thoughtcrime/securesms/payments/create/CreatePaymentFragment.java index a03dc63485..929f7d1ae0 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/payments/create/CreatePaymentFragment.java +++ b/app/src/main/java/org/thoughtcrime/securesms/payments/create/CreatePaymentFragment.java @@ -66,6 +66,7 @@ public class CreatePaymentFragment extends LoggingFragment { private View addNote; private View toggle; private Drawable infoIcon; + private Drawable spacer; private ConstraintSet cryptoConstraintSet; private ConstraintSet fiatConstraintSet; @@ -147,16 +148,13 @@ public class CreatePaymentFragment extends LoggingFragment { } private void initializeInfoIcon() { - Drawable pad = Objects.requireNonNull(AppCompatResources.getDrawable(requireContext(), R.drawable.payment_info_pad)); - Drawable info = Objects.requireNonNull(AppCompatResources.getDrawable(requireContext(), R.drawable.ic_update_info_16)); + spacer = Objects.requireNonNull(AppCompatResources.getDrawable(requireContext(), R.drawable.payment_info_pad)); + 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)); - info.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)); + spacer.setBounds(0, 0, ViewUtil.dpToPx(13), ViewUtil.dpToPx(16)); + infoIcon.setBounds(0, 0, ViewUtil.dpToPx(16), ViewUtil.dpToPx(16)); } private void updateNote(@Nullable CharSequence note) { @@ -195,6 +193,7 @@ public class CreatePaymentFragment extends LoggingFragment { if (inputState.getFiatMoney().isPresent()) { exchange.setVisibility(View.VISIBLE); exchange.setText(FiatMoneyUtil.format(getResources(), inputState.getFiatMoney().get(), FiatMoneyUtil.formatOptions().withDisplayTime(true))); + exchange.append(SpanUtil.buildImageSpan(spacer)); exchange.append(SpanUtil.buildImageSpan(infoIcon)); toggle.setVisibility(View.VISIBLE); toggle.setEnabled(true);