Skip to content

DTSERWFOUR-233 - Update Available Funds icon. #234

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
merged 2 commits into from
Jan 28, 2021
Merged

DTSERWFOUR-233 - Update Available Funds icon. #234

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2d20ee7
DTSERWFOUR-233 - Update Available Funds icon.
rajkumar-balakrishnasamy Jan 28, 2021
1a8edf8
Merge branch 'development' into task/DTSERWFOUR-233-Update-Available-…
rajkumar-balakrishnasamy Jan 28, 2021
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
Binary file modified commonui/src/main/res/font/hw_mobile_ui_sdk_icons.ttf
View file
Open in desktop
Binary file not shown.
1 change: 1 addition & 0 deletions commonui/src/main/res/values/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
<string name="paypal_account_font_icon" translatable="false">\ue906</string>
<string name="venmo_account_font_icon" translatable="false">\ue909</string>
<string name="cash_pickup_mg_font_icon" translatable="false">\ue905</string>
<string name="available_funds_font_icon" translatable="false">\ue90b</string>

<string name="endingIn">ending in %s</string>
<string name="to">to %s</string>
Expand Down
3 changes: 2 additions & 1 deletion ...sferui/src/main/java/com/hyperwallet/android/ui/transfer/view/CreateTransferFragment.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
3 changes: 2 additions & 1 deletion ...ui/src/main/java/com/hyperwallet/android/ui/transfer/view/ListTransferSourceFragment.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
4 changes: 2 additions & 2 deletions ...erui/src/main/java/com/hyperwallet/android/ui/transfer/view/ScheduleTransferFragment.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down Expand Up @@ -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() {
Expand Down