diff --git a/packages/espressocash_app/assets/icons/applepay_icon.svg b/packages/espressocash_app/assets/brands/apple_pay.svg similarity index 100% rename from packages/espressocash_app/assets/icons/applepay_icon.svg rename to packages/espressocash_app/assets/brands/apple_pay.svg diff --git a/packages/espressocash_app/assets/icons/arbitrum_icon.svg b/packages/espressocash_app/assets/brands/arbitrum.svg similarity index 100% rename from packages/espressocash_app/assets/icons/arbitrum_icon.svg rename to packages/espressocash_app/assets/brands/arbitrum.svg diff --git a/packages/espressocash_app/assets/icons/bank_icon.svg b/packages/espressocash_app/assets/brands/bank.svg similarity index 100% rename from packages/espressocash_app/assets/icons/bank_icon.svg rename to packages/espressocash_app/assets/brands/bank.svg diff --git a/packages/espressocash_app/assets/images/coinflow_icon.png b/packages/espressocash_app/assets/brands/coinflow.png similarity index 100% rename from packages/espressocash_app/assets/images/coinflow_icon.png rename to packages/espressocash_app/assets/brands/coinflow.png diff --git a/packages/espressocash_app/assets/icons/ethereum_icon.svg b/packages/espressocash_app/assets/brands/ethereum.svg similarity index 100% rename from packages/espressocash_app/assets/icons/ethereum_icon.svg rename to packages/espressocash_app/assets/brands/ethereum.svg diff --git a/packages/espressocash_app/assets/icons/gpay_icon.svg b/packages/espressocash_app/assets/brands/gpay.svg similarity index 100% rename from packages/espressocash_app/assets/icons/gpay_icon.svg rename to packages/espressocash_app/assets/brands/gpay.svg diff --git a/packages/espressocash_app/assets/images/guardian_icon.png b/packages/espressocash_app/assets/brands/guardarian.png similarity index 100% rename from packages/espressocash_app/assets/images/guardian_icon.png rename to packages/espressocash_app/assets/brands/guardarian.png diff --git a/packages/espressocash_app/assets/images/kado_icon.png b/packages/espressocash_app/assets/brands/kado.png similarity index 100% rename from packages/espressocash_app/assets/images/kado_icon.png rename to packages/espressocash_app/assets/brands/kado.png diff --git a/packages/espressocash_app/assets/icons/mastercard_icon.svg b/packages/espressocash_app/assets/brands/mastercard.svg similarity index 100% rename from packages/espressocash_app/assets/icons/mastercard_icon.svg rename to packages/espressocash_app/assets/brands/mastercard.svg diff --git a/packages/espressocash_app/assets/icons/messanger.svg b/packages/espressocash_app/assets/brands/messenger.svg similarity index 100% rename from packages/espressocash_app/assets/icons/messanger.svg rename to packages/espressocash_app/assets/brands/messenger.svg diff --git a/packages/espressocash_app/assets/images/moneygram_icon.png b/packages/espressocash_app/assets/brands/moneygram.png similarity index 100% rename from packages/espressocash_app/assets/images/moneygram_icon.png rename to packages/espressocash_app/assets/brands/moneygram.png diff --git a/packages/espressocash_app/assets/icons/pix_icon.svg b/packages/espressocash_app/assets/brands/pix.svg similarity index 100% rename from packages/espressocash_app/assets/icons/pix_icon.svg rename to packages/espressocash_app/assets/brands/pix.svg diff --git a/packages/espressocash_app/assets/icons/polygon_icon.svg b/packages/espressocash_app/assets/brands/polygon.svg similarity index 100% rename from packages/espressocash_app/assets/icons/polygon_icon.svg rename to packages/espressocash_app/assets/brands/polygon.svg diff --git a/packages/espressocash_app/assets/icons/qr.svg b/packages/espressocash_app/assets/brands/qr.svg similarity index 100% rename from packages/espressocash_app/assets/icons/qr.svg rename to packages/espressocash_app/assets/brands/qr.svg diff --git a/packages/espressocash_app/assets/images/ramp_icon.png b/packages/espressocash_app/assets/brands/ramp.png similarity index 100% rename from packages/espressocash_app/assets/images/ramp_icon.png rename to packages/espressocash_app/assets/brands/ramp.png diff --git a/packages/espressocash_app/assets/images/scalex_icon.png b/packages/espressocash_app/assets/brands/scalex.png similarity index 100% rename from packages/espressocash_app/assets/images/scalex_icon.png rename to packages/espressocash_app/assets/brands/scalex.png diff --git a/packages/espressocash_app/assets/icons/sepa_icon.svg b/packages/espressocash_app/assets/brands/sepa.svg similarity index 100% rename from packages/espressocash_app/assets/icons/sepa_icon.svg rename to packages/espressocash_app/assets/brands/sepa.svg diff --git a/packages/espressocash_app/assets/icons/signal.svg b/packages/espressocash_app/assets/brands/signal.svg similarity index 100% rename from packages/espressocash_app/assets/icons/signal.svg rename to packages/espressocash_app/assets/brands/signal.svg diff --git a/packages/espressocash_app/assets/icons/sms.svg b/packages/espressocash_app/assets/brands/sms.svg similarity index 100% rename from packages/espressocash_app/assets/icons/sms.svg rename to packages/espressocash_app/assets/brands/sms.svg diff --git a/packages/espressocash_app/assets/icons/snapchat.svg b/packages/espressocash_app/assets/brands/snapchat.svg similarity index 100% rename from packages/espressocash_app/assets/icons/snapchat.svg rename to packages/espressocash_app/assets/brands/snapchat.svg diff --git a/packages/espressocash_app/assets/icons/solana_icon.svg b/packages/espressocash_app/assets/brands/solana.svg similarity index 100% rename from packages/espressocash_app/assets/icons/solana_icon.svg rename to packages/espressocash_app/assets/brands/solana.svg diff --git a/packages/espressocash_app/assets/icons/swift_icon.svg b/packages/espressocash_app/assets/brands/swift.svg similarity index 100% rename from packages/espressocash_app/assets/icons/swift_icon.svg rename to packages/espressocash_app/assets/brands/swift.svg diff --git a/packages/espressocash_app/assets/icons/telegram.svg b/packages/espressocash_app/assets/brands/telegram.svg similarity index 100% rename from packages/espressocash_app/assets/icons/telegram.svg rename to packages/espressocash_app/assets/brands/telegram.svg diff --git a/packages/espressocash_app/assets/icons/visa_icon.svg b/packages/espressocash_app/assets/brands/visa.svg similarity index 100% rename from packages/espressocash_app/assets/icons/visa_icon.svg rename to packages/espressocash_app/assets/brands/visa.svg diff --git a/packages/espressocash_app/assets/icons/wechat.svg b/packages/espressocash_app/assets/brands/wechat.svg similarity index 100% rename from packages/espressocash_app/assets/icons/wechat.svg rename to packages/espressocash_app/assets/brands/wechat.svg diff --git a/packages/espressocash_app/assets/icons/whatsapp.svg b/packages/espressocash_app/assets/brands/whatsapp.svg similarity index 100% rename from packages/espressocash_app/assets/icons/whatsapp.svg rename to packages/espressocash_app/assets/brands/whatsapp.svg diff --git a/packages/espressocash_app/assets/icons/x.svg b/packages/espressocash_app/assets/brands/x.svg similarity index 100% rename from packages/espressocash_app/assets/icons/x.svg rename to packages/espressocash_app/assets/brands/x.svg diff --git a/packages/espressocash_app/assets/icons/close-button-icon-light.svg b/packages/espressocash_app/assets/icons/close-button-icon-light.svg deleted file mode 100644 index ae81de5d4b..0000000000 --- a/packages/espressocash_app/assets/icons/close-button-icon-light.svg +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/packages/espressocash_app/assets/icons/favorite.svg b/packages/espressocash_app/assets/icons/favorite.svg deleted file mode 100644 index d1712e9d35..0000000000 --- a/packages/espressocash_app/assets/icons/favorite.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/packages/espressocash_app/assets/icons/lock.svg b/packages/espressocash_app/assets/icons/lock.svg deleted file mode 100644 index c4c573c4de..0000000000 --- a/packages/espressocash_app/assets/icons/lock.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/packages/espressocash_app/assets/icons/logo_dark.svg b/packages/espressocash_app/assets/icons/logo_dark.svg deleted file mode 100644 index abeecab33f..0000000000 --- a/packages/espressocash_app/assets/icons/logo_dark.svg +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/packages/espressocash_app/assets/icons/profile.svg b/packages/espressocash_app/assets/icons/profile.svg deleted file mode 100644 index f2d68e22e4..0000000000 --- a/packages/espressocash_app/assets/icons/profile.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/packages/espressocash_app/assets/icons/receive.svg b/packages/espressocash_app/assets/icons/receive.svg deleted file mode 100644 index 740a856baf..0000000000 --- a/packages/espressocash_app/assets/icons/receive.svg +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/packages/espressocash_app/assets/icons/search-button-icon.svg b/packages/espressocash_app/assets/icons/search-button-icon.svg deleted file mode 100644 index 661d998a8a..0000000000 --- a/packages/espressocash_app/assets/icons/search-button-icon.svg +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/packages/espressocash_app/assets/icons/secret.svg b/packages/espressocash_app/assets/icons/secret.svg deleted file mode 100644 index 93c546d79c..0000000000 --- a/packages/espressocash_app/assets/icons/secret.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/packages/espressocash_app/assets/icons/send.svg b/packages/espressocash_app/assets/icons/send.svg deleted file mode 100644 index d4994953a8..0000000000 --- a/packages/espressocash_app/assets/icons/send.svg +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/packages/espressocash_app/assets/icons/subtract.svg b/packages/espressocash_app/assets/icons/subtract.svg deleted file mode 100644 index 2359abed7e..0000000000 --- a/packages/espressocash_app/assets/icons/subtract.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/packages/espressocash_app/assets/icons/success-icon-dark-bg.svg b/packages/espressocash_app/assets/icons/success-icon-dark-bg.svg deleted file mode 100644 index f9fb447035..0000000000 --- a/packages/espressocash_app/assets/icons/success-icon-dark-bg.svg +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/packages/espressocash_app/assets/icons/success-icon.svg b/packages/espressocash_app/assets/icons/success-icon.svg deleted file mode 100644 index cabeb73e6a..0000000000 --- a/packages/espressocash_app/assets/icons/success-icon.svg +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/packages/espressocash_app/assets/icons/swap.svg b/packages/espressocash_app/assets/icons/swap.svg deleted file mode 100644 index fbf8e83ac5..0000000000 --- a/packages/espressocash_app/assets/icons/swap.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/packages/espressocash_app/assets/icons/unfavorite.svg b/packages/espressocash_app/assets/icons/unfavorite.svg deleted file mode 100644 index 8dc1a0107d..0000000000 --- a/packages/espressocash_app/assets/icons/unfavorite.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/packages/espressocash_app/assets/icons/unfavorite_light.svg b/packages/espressocash_app/assets/icons/unfavorite_light.svg deleted file mode 100644 index 8555f60fc9..0000000000 --- a/packages/espressocash_app/assets/icons/unfavorite_light.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/packages/espressocash_app/assets/icons/visibility.svg b/packages/espressocash_app/assets/icons/visibility.svg deleted file mode 100644 index f521b74a99..0000000000 --- a/packages/espressocash_app/assets/icons/visibility.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/packages/espressocash_app/assets/images/investing-banner.png b/packages/espressocash_app/assets/images/investing-banner.png deleted file mode 100644 index 3b40a69dc9..0000000000 Binary files a/packages/espressocash_app/assets/images/investing-banner.png and /dev/null differ diff --git a/packages/espressocash_app/assets/images/logo-android12.png b/packages/espressocash_app/assets/images/logo-android12.png deleted file mode 100644 index 36ee2e0a0a..0000000000 Binary files a/packages/espressocash_app/assets/images/logo-android12.png and /dev/null differ diff --git a/packages/espressocash_app/assets/images/logo-dark.png b/packages/espressocash_app/assets/images/logo-dark.png deleted file mode 100644 index fc16dbbbb4..0000000000 Binary files a/packages/espressocash_app/assets/images/logo-dark.png and /dev/null differ diff --git a/packages/espressocash_app/assets/images/switch-currency.svg b/packages/espressocash_app/assets/images/switch-currency.svg deleted file mode 100644 index 4bb330ad71..0000000000 --- a/packages/espressocash_app/assets/images/switch-currency.svg +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/packages/espressocash_app/assets/coinflow/asset-manifest.json b/packages/espressocash_app/assets/partners/coinflow/asset-manifest.json similarity index 100% rename from packages/espressocash_app/assets/coinflow/asset-manifest.json rename to packages/espressocash_app/assets/partners/coinflow/asset-manifest.json diff --git a/packages/espressocash_app/assets/coinflow/favicon.ico b/packages/espressocash_app/assets/partners/coinflow/favicon.ico similarity index 100% rename from packages/espressocash_app/assets/coinflow/favicon.ico rename to packages/espressocash_app/assets/partners/coinflow/favicon.ico diff --git a/packages/espressocash_app/assets/coinflow/index.html b/packages/espressocash_app/assets/partners/coinflow/index.html similarity index 100% rename from packages/espressocash_app/assets/coinflow/index.html rename to packages/espressocash_app/assets/partners/coinflow/index.html diff --git a/packages/espressocash_app/assets/coinflow/manifest.json b/packages/espressocash_app/assets/partners/coinflow/manifest.json similarity index 100% rename from packages/espressocash_app/assets/coinflow/manifest.json rename to packages/espressocash_app/assets/partners/coinflow/manifest.json diff --git a/packages/espressocash_app/assets/coinflow/static/css/main.b5d7fea6.css b/packages/espressocash_app/assets/partners/coinflow/static/css/main.b5d7fea6.css similarity index 100% rename from packages/espressocash_app/assets/coinflow/static/css/main.b5d7fea6.css rename to packages/espressocash_app/assets/partners/coinflow/static/css/main.b5d7fea6.css diff --git a/packages/espressocash_app/assets/coinflow/static/js/main.2e2aa599.js b/packages/espressocash_app/assets/partners/coinflow/static/js/main.2e2aa599.js similarity index 100% rename from packages/espressocash_app/assets/coinflow/static/js/main.2e2aa599.js rename to packages/espressocash_app/assets/partners/coinflow/static/js/main.2e2aa599.js diff --git a/packages/espressocash_app/assets/moneygram/style.css b/packages/espressocash_app/assets/partners/moneygram/style.css similarity index 100% rename from packages/espressocash_app/assets/moneygram/style.css rename to packages/espressocash_app/assets/partners/moneygram/style.css diff --git a/packages/espressocash_app/assets/scalex/style.css b/packages/espressocash_app/assets/partners/scalex/style.css similarity index 100% rename from packages/espressocash_app/assets/scalex/style.css rename to packages/espressocash_app/assets/partners/scalex/style.css diff --git a/packages/espressocash_app/assets/rive/second-link.riv b/packages/espressocash_app/assets/rive/second-link.riv deleted file mode 100644 index 3c5efc567f..0000000000 Binary files a/packages/espressocash_app/assets/rive/second-link.riv and /dev/null differ diff --git a/packages/espressocash_app/lib/features/profile/widgets/share_section.dart b/packages/espressocash_app/lib/features/profile/widgets/share_section.dart index e70a16928b..b14b3d2727 100644 --- a/packages/espressocash_app/lib/features/profile/widgets/share_section.dart +++ b/packages/espressocash_app/lib/features/profile/widgets/share_section.dart @@ -19,7 +19,7 @@ class ShareSection extends StatelessWidget { children: [ Text(context.l10n.followUsOn), const SizedBox(width: 6), - Assets.icons.x.svg( + Assets.brands.x.svg( height: 22, width: 22, color: Colors.white, diff --git a/packages/espressocash_app/lib/features/ramp/partners/coinflow/widgets/launch.dart b/packages/espressocash_app/lib/features/ramp/partners/coinflow/widgets/launch.dart index bd6b15c59d..abc133c154 100644 --- a/packages/espressocash_app/lib/features/ramp/partners/coinflow/widgets/launch.dart +++ b/packages/espressocash_app/lib/features/ramp/partners/coinflow/widgets/launch.dart @@ -9,6 +9,7 @@ import 'package:url_launcher/url_launcher.dart'; import '../../../../../config.dart'; import '../../../../../di.dart'; +import '../../../../../gen/assets.gen.dart'; import '../../../../../l10n/l10n.dart'; import '../../../../../ui/loader.dart'; import '../../../../../ui/snackbar.dart'; @@ -70,7 +71,7 @@ extension BuildContextExt on BuildContext { Future handleLoaded(InAppWebViewController controller) async { if (!hasLoaded) { await controller.loadFile( - assetFilePath: 'assets/coinflow/index.html', + assetFilePath: Assets.partners.coinflow.index, ); controller.addJavaScriptHandler( diff --git a/packages/espressocash_app/lib/features/ramp/partners/moneygram/widgets/style.dart b/packages/espressocash_app/lib/features/ramp/partners/moneygram/widgets/style.dart index d1e0718353..84ea395ebe 100644 --- a/packages/espressocash_app/lib/features/ramp/partners/moneygram/widgets/style.dart +++ b/packages/espressocash_app/lib/features/ramp/partners/moneygram/widgets/style.dart @@ -3,7 +3,7 @@ import 'package:flutter/services.dart'; import '../../../../../gen/assets.gen.dart'; Future loadMoneygramStyle() async { - final css = await rootBundle.loadString(Assets.moneygram.style); + final css = await rootBundle.loadString(Assets.partners.moneygram.style); return """ (function() { diff --git a/packages/espressocash_app/lib/features/ramp/partners/scalex/widgets/launch.dart b/packages/espressocash_app/lib/features/ramp/partners/scalex/widgets/launch.dart index 9e9f149e0a..0be61d9b92 100644 --- a/packages/espressocash_app/lib/features/ramp/partners/scalex/widgets/launch.dart +++ b/packages/espressocash_app/lib/features/ramp/partners/scalex/widgets/launch.dart @@ -456,7 +456,7 @@ extension on Amount { } Future _loadCustomStyle() async { - final css = await rootBundle.loadString(Assets.scalex.style); + final css = await rootBundle.loadString(Assets.partners.scalex.style); return """ (function() { diff --git a/packages/espressocash_app/lib/features/ramp_partner/models/payment_methods.dart b/packages/espressocash_app/lib/features/ramp_partner/models/payment_methods.dart index 66aba534f1..1c21d792c0 100644 --- a/packages/espressocash_app/lib/features/ramp_partner/models/payment_methods.dart +++ b/packages/espressocash_app/lib/features/ramp_partner/models/payment_methods.dart @@ -15,21 +15,21 @@ extension PaymentMethodAssets on PaymentMethod { SvgGenImage get logo { switch (this) { case PaymentMethod.visa: - return Assets.icons.visaIcon; + return Assets.brands.visa; case PaymentMethod.mastercard: - return Assets.icons.mastercardIcon; + return Assets.brands.mastercard; case PaymentMethod.applePay: - return Assets.icons.applepayIcon; + return Assets.brands.applePay; case PaymentMethod.googlePay: - return Assets.icons.gpayIcon; + return Assets.brands.gpay; case PaymentMethod.bank: - return Assets.icons.bankIcon; + return Assets.brands.bank; case PaymentMethod.sepa: - return Assets.icons.sepaIcon; + return Assets.brands.sepa; case PaymentMethod.pix: - return Assets.icons.pixIcon; + return Assets.brands.pix; case PaymentMethod.swift: - return Assets.icons.swiftIcon; + return Assets.brands.swift; } } } diff --git a/packages/espressocash_app/lib/features/ramp_partner/models/ramp_partner.dart b/packages/espressocash_app/lib/features/ramp_partner/models/ramp_partner.dart index 13f3579fee..d8557ab462 100644 --- a/packages/espressocash_app/lib/features/ramp_partner/models/ramp_partner.dart +++ b/packages/espressocash_app/lib/features/ramp_partner/models/ramp_partner.dart @@ -90,17 +90,17 @@ extension RampPartnerAssets on RampPartner { AssetGenImage get logo { switch (this) { case RampPartner.kado: - return Assets.images.kadoIcon; + return Assets.brands.kado; case RampPartner.rampNetwork: - return Assets.images.rampIcon; + return Assets.brands.ramp; case RampPartner.coinflow: - return Assets.images.coinflowIcon; + return Assets.brands.coinflow; case RampPartner.guardarian: - return Assets.images.guardianIcon; - case RampPartner.moneygram: - return Assets.images.moneygramIcon; + return Assets.brands.guardarian; case RampPartner.scalex: - return Assets.images.scalexIcon; + return Assets.brands.scalex; + case RampPartner.moneygram: + return Assets.brands.moneygram; case RampPartner.brij: return Assets.images.logoIcon; } diff --git a/packages/espressocash_app/lib/features/wallet_flow/screens/pay_screen.dart b/packages/espressocash_app/lib/features/wallet_flow/screens/pay_screen.dart index 6f6f9ab09d..14b66bc3c5 100644 --- a/packages/espressocash_app/lib/features/wallet_flow/screens/pay_screen.dart +++ b/packages/espressocash_app/lib/features/wallet_flow/screens/pay_screen.dart @@ -132,14 +132,14 @@ class _PayScreenState extends State { onPressed: _handlePrimaryPressed, icon: Assets.icons.dollarSign, subtitleIcons: [ - Assets.icons.telegram, - Assets.icons.whatsapp, - Assets.icons.messanger, - Assets.icons.sms, - Assets.icons.snapchat, - Assets.icons.wechat, - Assets.icons.signal, - Assets.icons.qr, + Assets.brands.telegram, + Assets.brands.whatsapp, + Assets.brands.messenger, + Assets.brands.sms, + Assets.brands.snapchat, + Assets.brands.wechat, + Assets.brands.signal, + Assets.brands.qr, ], ), SizedBox(height: 20.h), @@ -148,10 +148,10 @@ class _PayScreenState extends State { onPressed: _handleSecondaryPressed, icon: Assets.icons.walletAddress, subtitleIcons: [ - Assets.icons.solanaIcon, - Assets.icons.ethereumIcon, - Assets.icons.polygonIcon, - Assets.icons.arbitrumIcon, + Assets.brands.solana, + Assets.brands.ethereum, + Assets.brands.polygon, + Assets.brands.arbitrum, ], ), ], diff --git a/packages/espressocash_app/pubspec.yaml b/packages/espressocash_app/pubspec.yaml index 4eb3c27d5c..c7b809dd3e 100644 --- a/packages/espressocash_app/pubspec.yaml +++ b/packages/espressocash_app/pubspec.yaml @@ -121,13 +121,15 @@ flutter: - assets/icons/ - assets/rive/ - assets/gifs/ - - assets/coinflow/ - - assets/coinflow/static/ - - assets/coinflow/static/js/ - - assets/coinflow/static/css/ - - assets/scalex/ - - assets/moneygram/ + - assets/brands/ - assets/tokens/ + - assets/partners/ + - assets/partners/moneygram/ + - assets/partners/scalex/ + - assets/partners/coinflow/ + - assets/partners/coinflow/static/ + - assets/partners/coinflow/static/js/ + - assets/partners/coinflow/static/css/ fonts: - family: RobotoApp