From e63137d293e9a879f2dc1754f4408dddae6f4ec9 Mon Sep 17 00:00:00 2001 From: Alex Hart Date: Thu, 19 Oct 2023 10:15:17 -0300 Subject: [PATCH] Add bank icons and ideal logo. --- .../gateway/GatewaySelectorBottomSheet.kt | 4 +- .../donate/transfer/ideal/IdealBank.kt | 26 ++-- app/src/main/res/drawable/ideal_abn_amro.xml | 21 +++ app/src/main/res/drawable/ideal_asn.xml | 23 ++++ app/src/main/res/drawable/ideal_bunq.xml | 23 ++++ app/src/main/res/drawable/ideal_ing.xml | 120 ++++++++++++++++++ app/src/main/res/drawable/ideal_knab.xml | 18 +++ app/src/main/res/drawable/ideal_n26.xml | 15 +++ app/src/main/res/drawable/ideal_rabobank.xml | 61 +++++++++ app/src/main/res/drawable/ideal_regiobank.xml | 19 +++ app/src/main/res/drawable/ideal_revolut.xml | 21 +++ app/src/main/res/drawable/ideal_sns.xml | 14 ++ .../main/res/drawable/ideal_triodos_bank.xml | 19 +++ .../main/res/drawable/ideal_van_lanschot.xml | 15 +++ app/src/main/res/drawable/ideal_yoursafe.xml | 34 +++++ app/src/main/res/drawable/logo_ideal.xml | 21 +++ 16 files changed, 439 insertions(+), 15 deletions(-) create mode 100644 app/src/main/res/drawable/ideal_abn_amro.xml create mode 100644 app/src/main/res/drawable/ideal_asn.xml create mode 100644 app/src/main/res/drawable/ideal_bunq.xml create mode 100644 app/src/main/res/drawable/ideal_ing.xml create mode 100644 app/src/main/res/drawable/ideal_knab.xml create mode 100644 app/src/main/res/drawable/ideal_n26.xml create mode 100644 app/src/main/res/drawable/ideal_rabobank.xml create mode 100644 app/src/main/res/drawable/ideal_regiobank.xml create mode 100644 app/src/main/res/drawable/ideal_revolut.xml create mode 100644 app/src/main/res/drawable/ideal_sns.xml create mode 100644 app/src/main/res/drawable/ideal_triodos_bank.xml create mode 100644 app/src/main/res/drawable/ideal_van_lanschot.xml create mode 100644 app/src/main/res/drawable/ideal_yoursafe.xml create mode 100644 app/src/main/res/drawable/logo_ideal.xml diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/gateway/GatewaySelectorBottomSheet.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/gateway/GatewaySelectorBottomSheet.kt index b9b71cc549..cb3b9425cf 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/gateway/GatewaySelectorBottomSheet.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/gateway/GatewaySelectorBottomSheet.kt @@ -16,6 +16,7 @@ import org.thoughtcrime.securesms.components.settings.DSLSettingsAdapter import org.thoughtcrime.securesms.components.settings.DSLSettingsBottomSheetFragment import org.thoughtcrime.securesms.components.settings.DSLSettingsIcon import org.thoughtcrime.securesms.components.settings.DSLSettingsText +import org.thoughtcrime.securesms.components.settings.NO_TINT import org.thoughtcrime.securesms.components.settings.app.subscription.DonationPaymentComponent import org.thoughtcrime.securesms.components.settings.app.subscription.donate.DonateToSignalType import org.thoughtcrime.securesms.components.settings.app.subscription.models.GooglePayButton @@ -167,10 +168,9 @@ class GatewaySelectorBottomSheet : DSLSettingsBottomSheetFragment() { space(8.dp) } - // TODO [sepa] -- Final assets and copy tonalButton( text = DSLSettingsText.from(R.string.GatewaySelectorBottomSheet__ideal), - icon = DSLSettingsIcon.from(R.drawable.bank_transfer), + icon = DSLSettingsIcon.from(R.drawable.logo_ideal, NO_TINT), onClick = { findNavController().popBackStack() val response = GatewayResponse(GatewayResponse.Gateway.IDEAL, args.request) diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/transfer/ideal/IdealBank.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/transfer/ideal/IdealBank.kt index ceeb99ac31..9efffaa9dc 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/transfer/ideal/IdealBank.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/transfer/ideal/IdealBank.kt @@ -41,55 +41,55 @@ enum class IdealBank( arrayOf( ABN_AMRO to UIValues( name = R.string.IdealBank__abn_amro, - icon = R.drawable.ic_person_large // TODO [sepa] -- final icon + icon = R.drawable.ideal_abn_amro ), ASN_BANK to UIValues( name = R.string.IdealBank__asn_bank, - icon = R.drawable.ic_person_large // TODO [sepa] -- final icon + icon = R.drawable.ideal_asn ), BUNQ to UIValues( name = R.string.IdealBank__bunq, - icon = R.drawable.ic_person_large // TODO [sepa] -- final icon + icon = R.drawable.ideal_bunq ), ING to UIValues( name = R.string.IdealBank__ing, - icon = R.drawable.ic_person_large // TODO [sepa] -- final icon + icon = R.drawable.ideal_ing ), KNAB to UIValues( name = R.string.IdealBank__knab, - icon = R.drawable.ic_person_large // TODO [sepa] -- final icon + icon = R.drawable.ideal_knab ), N26 to UIValues( name = R.string.IdealBank__n26, - icon = R.drawable.ic_person_large // TODO [sepa] -- final icon + icon = R.drawable.ideal_n26 ), RABOBANK to UIValues( name = R.string.IdealBank__rabobank, - icon = R.drawable.ic_person_large // TODO [sepa] -- final icon + icon = R.drawable.ideal_rabobank ), REGIOBANK to UIValues( name = R.string.IdealBank__regiobank, - icon = R.drawable.ic_person_large // TODO [sepa] -- final icon + icon = R.drawable.ideal_regiobank ), REVOLUT to UIValues( name = R.string.IdealBank__revolut, - icon = R.drawable.ic_person_large // TODO [sepa] -- final icon + icon = R.drawable.ideal_revolut ), SNS_BANK to UIValues( name = R.string.IdealBank__sns_bank, - icon = R.drawable.ic_person_large // TODO [sepa] -- final icon + icon = R.drawable.ideal_sns ), TRIODOS_BANK to UIValues( name = R.string.IdealBank__triodos_bank, - icon = R.drawable.ic_person_large // TODO [sepa] -- final icon + icon = R.drawable.ideal_triodos_bank ), VAN_LANCHOT to UIValues( name = R.string.IdealBank__van_lanchot, - icon = R.drawable.ic_person_large // TODO [sepa] -- final icon + icon = R.drawable.ideal_van_lanschot ), YOURSAFE to UIValues( name = R.string.IdealBank__yoursafe, - icon = R.drawable.ic_person_large // TODO [sepa] -- final icon + icon = R.drawable.ideal_yoursafe ) ) ) diff --git a/app/src/main/res/drawable/ideal_abn_amro.xml b/app/src/main/res/drawable/ideal_abn_amro.xml new file mode 100644 index 0000000000..e0c3ba03a9 --- /dev/null +++ b/app/src/main/res/drawable/ideal_abn_amro.xml @@ -0,0 +1,21 @@ + + + + + + + + diff --git a/app/src/main/res/drawable/ideal_asn.xml b/app/src/main/res/drawable/ideal_asn.xml new file mode 100644 index 0000000000..13952f7bc1 --- /dev/null +++ b/app/src/main/res/drawable/ideal_asn.xml @@ -0,0 +1,23 @@ + + + + + + + + diff --git a/app/src/main/res/drawable/ideal_bunq.xml b/app/src/main/res/drawable/ideal_bunq.xml new file mode 100644 index 0000000000..8698f20664 --- /dev/null +++ b/app/src/main/res/drawable/ideal_bunq.xml @@ -0,0 +1,23 @@ + + + + + + + + + diff --git a/app/src/main/res/drawable/ideal_ing.xml b/app/src/main/res/drawable/ideal_ing.xml new file mode 100644 index 0000000000..9c07e39765 --- /dev/null +++ b/app/src/main/res/drawable/ideal_ing.xml @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/drawable/ideal_knab.xml b/app/src/main/res/drawable/ideal_knab.xml new file mode 100644 index 0000000000..3c4c0d953d --- /dev/null +++ b/app/src/main/res/drawable/ideal_knab.xml @@ -0,0 +1,18 @@ + + + + + + + diff --git a/app/src/main/res/drawable/ideal_n26.xml b/app/src/main/res/drawable/ideal_n26.xml new file mode 100644 index 0000000000..f952abf410 --- /dev/null +++ b/app/src/main/res/drawable/ideal_n26.xml @@ -0,0 +1,15 @@ + + + + + + diff --git a/app/src/main/res/drawable/ideal_rabobank.xml b/app/src/main/res/drawable/ideal_rabobank.xml new file mode 100644 index 0000000000..4a9c71ced9 --- /dev/null +++ b/app/src/main/res/drawable/ideal_rabobank.xml @@ -0,0 +1,61 @@ + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/drawable/ideal_regiobank.xml b/app/src/main/res/drawable/ideal_regiobank.xml new file mode 100644 index 0000000000..0c820802d1 --- /dev/null +++ b/app/src/main/res/drawable/ideal_regiobank.xml @@ -0,0 +1,19 @@ + + + + + + + diff --git a/app/src/main/res/drawable/ideal_revolut.xml b/app/src/main/res/drawable/ideal_revolut.xml new file mode 100644 index 0000000000..c30e83242f --- /dev/null +++ b/app/src/main/res/drawable/ideal_revolut.xml @@ -0,0 +1,21 @@ + + + + + + + + diff --git a/app/src/main/res/drawable/ideal_sns.xml b/app/src/main/res/drawable/ideal_sns.xml new file mode 100644 index 0000000000..fe60e96e2c --- /dev/null +++ b/app/src/main/res/drawable/ideal_sns.xml @@ -0,0 +1,14 @@ + + + + + + diff --git a/app/src/main/res/drawable/ideal_triodos_bank.xml b/app/src/main/res/drawable/ideal_triodos_bank.xml new file mode 100644 index 0000000000..c819722017 --- /dev/null +++ b/app/src/main/res/drawable/ideal_triodos_bank.xml @@ -0,0 +1,19 @@ + + + + + + + diff --git a/app/src/main/res/drawable/ideal_van_lanschot.xml b/app/src/main/res/drawable/ideal_van_lanschot.xml new file mode 100644 index 0000000000..7b3cf39200 --- /dev/null +++ b/app/src/main/res/drawable/ideal_van_lanschot.xml @@ -0,0 +1,15 @@ + + + + + + diff --git a/app/src/main/res/drawable/ideal_yoursafe.xml b/app/src/main/res/drawable/ideal_yoursafe.xml new file mode 100644 index 0000000000..b3febead3d --- /dev/null +++ b/app/src/main/res/drawable/ideal_yoursafe.xml @@ -0,0 +1,34 @@ + + + + + + + + + + + diff --git a/app/src/main/res/drawable/logo_ideal.xml b/app/src/main/res/drawable/logo_ideal.xml new file mode 100644 index 0000000000..b9bd1a3e97 --- /dev/null +++ b/app/src/main/res/drawable/logo_ideal.xml @@ -0,0 +1,21 @@ + + + + + + +