diff --git a/commonui/src/main/res/font/hw_mobile_ui_sdk_icons.ttf b/commonui/src/main/res/font/hw_mobile_ui_sdk_icons.ttf index 34086f178..d90500355 100644 Binary files a/commonui/src/main/res/font/hw_mobile_ui_sdk_icons.ttf and b/commonui/src/main/res/font/hw_mobile_ui_sdk_icons.ttf differ diff --git a/commonui/src/main/res/values/strings.xml b/commonui/src/main/res/values/strings.xml index e9417fe6a..da5cebe47 100644 --- a/commonui/src/main/res/values/strings.xml +++ b/commonui/src/main/res/values/strings.xml @@ -26,6 +26,7 @@ \ue906 \ue909 \ue905 + \ue90b ending in %s to %s diff --git a/transferui/src/main/java/com/hyperwallet/android/ui/transfer/view/CreateTransferFragment.java b/transferui/src/main/java/com/hyperwallet/android/ui/transfer/view/CreateTransferFragment.java index 5558cadef..a13061919 100644 --- a/transferui/src/main/java/com/hyperwallet/android/ui/transfer/view/CreateTransferFragment.java +++ b/transferui/src/main/java/com/hyperwallet/android/ui/transfer/view/CreateTransferFragment.java @@ -743,13 +743,14 @@ private void showTransferSource(@NonNull final TransferSource transferSource) { if (transferSource.getType().equals(PREPAID_CARD)) { transferSourceTitle.setText( getTransferMethodName(transferSourceIdentifier.getContext(), transferSource.getType())); + transferSourceIcon.setText(getStringFontIcon(transferSourceIcon.getContext(), transferSource.getType())); } else { transferSourceTitle.setText(transferSourceIdentifier.getContext().getString(R.string.availableFunds)); + transferSourceIcon.setText(transferSourceIcon.getContext().getString(R.string.available_funds_font_icon)); } transferSourceIdentifier.setText(transferSource.getIdentification() == null ? "" : getTransferMethodDetail(transferSourceIdentifier.getContext(), transferSource.getIdentification(), transferSource.getType())); - transferSourceIcon.setText(getStringFontIcon(transferSourceIcon.getContext(), transferSource.getType())); } private String formattedAmount(final double amount, final String currencyCode) { diff --git a/transferui/src/main/java/com/hyperwallet/android/ui/transfer/view/ListTransferSourceFragment.java b/transferui/src/main/java/com/hyperwallet/android/ui/transfer/view/ListTransferSourceFragment.java index 04d432a86..c788fb7e5 100644 --- a/transferui/src/main/java/com/hyperwallet/android/ui/transfer/view/ListTransferSourceFragment.java +++ b/transferui/src/main/java/com/hyperwallet/android/ui/transfer/view/ListTransferSourceFragment.java @@ -224,13 +224,14 @@ void bind(@NonNull final TransferSource source, final boolean selected) { mSource = source; if (source.getType().equals(PREPAID_CARD)) { mTitle.setText(getTransferMethodName(mTitle.getContext(), source.getType())); + mIcon.setText(getStringFontIcon(mIcon.getContext(), source.getType())); } else { mTitle.setText(mTitle.getContext().getString(R.string.availableFunds)); + mIcon.setText(mIcon.getContext().getString(R.string.available_funds_font_icon)); } mTransferSourceIdentification.setText(source.getIdentification() == null ? "" : getTransferMethodDetail(mTransferSourceIdentification.getContext(), source.getIdentification(), source.getType())); - mIcon.setText(getStringFontIcon(mIcon.getContext(), source.getType())); if (selected) { mSelectedIcon.setVisibility(View.VISIBLE); diff --git a/transferui/src/main/java/com/hyperwallet/android/ui/transfer/view/ScheduleTransferFragment.java b/transferui/src/main/java/com/hyperwallet/android/ui/transfer/view/ScheduleTransferFragment.java index cc5b489ec..e0424e7e0 100644 --- a/transferui/src/main/java/com/hyperwallet/android/ui/transfer/view/ScheduleTransferFragment.java +++ b/transferui/src/main/java/com/hyperwallet/android/ui/transfer/view/ScheduleTransferFragment.java @@ -52,7 +52,6 @@ import com.hyperwallet.android.ui.transfer.TransferSource; import com.hyperwallet.android.ui.transfer.viewmodel.ScheduleTransferViewModel; -import java.util.Currency; import java.util.List; import java.util.Locale; @@ -151,13 +150,14 @@ private void showTransferSource() { if (transferSource.getType().equals(PREPAID_CARD)) { transferSourceTitle.setText( getTransferMethodName(transferSourceIdentifier.getContext(), transferSource.getType())); + transferSourceIcon.setText(getStringFontIcon(transferSourceIcon.getContext(), transferSource.getType())); } else { transferSourceTitle.setText(transferSourceIdentifier.getContext().getString(R.string.availableFunds)); + transferSourceIcon.setText(transferSourceIcon.getContext().getString(R.string.available_funds_font_icon)); } transferSourceIdentifier.setText(transferSource.getIdentification() == null ? "" : getTransferMethodDetail(transferSourceIdentifier.getContext(), transferSource.getIdentification(), transferSource.getType())); - transferSourceIcon.setText(getStringFontIcon(transferSourceIcon.getContext(), transferSource.getType())); } private void showForeignExchange() {