diff --git a/lib/pages/exchange_view/exchange_step_views/step_4_view.dart b/lib/pages/exchange_view/exchange_step_views/step_4_view.dart index 8fa0eedc6..ba8a3871a 100644 --- a/lib/pages/exchange_view/exchange_step_views/step_4_view.dart +++ b/lib/pages/exchange_view/exchange_step_views/step_4_view.dart @@ -37,6 +37,7 @@ import 'package:stackwallet/utilities/text_styles.dart'; import 'package:stackwallet/wallets/isar/providers/wallet_info_provider.dart'; import 'package:stackwallet/wallets/models/tx_data.dart'; import 'package:stackwallet/wallets/wallet/impl/firo_wallet.dart'; +import 'package:stackwallet/whiteLabel.dart'; import 'package:stackwallet/widgets/background.dart'; import 'package:stackwallet/widgets/custom_buttons/app_bar_icon_button.dart'; import 'package:stackwallet/widgets/desktop/secondary_button.dart'; @@ -815,7 +816,8 @@ class _Step4ViewState extends ConsumerState { if (isWalletCoin) Builder( builder: (context) { - String buttonTitle = "Send from Stack Wallet"; + String buttonTitle = + "Send from {$WhiteLabel.appName}"; final tuple = ref .read( diff --git a/lib/pages/intro_view.dart b/lib/pages/intro_view.dart index 2eecd4983..9fc83144b 100644 --- a/lib/pages/intro_view.dart +++ b/lib/pages/intro_view.dart @@ -21,6 +21,7 @@ import 'package:stackwallet/themes/theme_providers.dart'; import 'package:stackwallet/utilities/prefs.dart'; import 'package:stackwallet/utilities/text_styles.dart'; import 'package:stackwallet/utilities/util.dart'; +import 'package:stackwallet/whiteLabel.dart'; import 'package:stackwallet/widgets/background.dart'; import 'package:stackwallet/widgets/desktop/secondary_button.dart'; import 'package:url_launcher/url_launcher.dart'; @@ -199,7 +200,7 @@ class AppNameText extends StatelessWidget { @override Widget build(BuildContext context) { return Text( - "Stack Wallet", + "{$WhiteLabel.appName}", textAlign: TextAlign.center, style: !isDesktop ? STextStyles.pageTitleH1(context) diff --git a/lib/pages/settings_views/global_settings_view/stack_backup_views/restore_from_file_view.dart b/lib/pages/settings_views/global_settings_view/stack_backup_views/restore_from_file_view.dart index ccba85e65..dde6cb76c 100644 --- a/lib/pages/settings_views/global_settings_view/stack_backup_views/restore_from_file_view.dart +++ b/lib/pages/settings_views/global_settings_view/stack_backup_views/restore_from_file_view.dart @@ -26,6 +26,7 @@ import 'package:stackwallet/utilities/constants.dart'; import 'package:stackwallet/utilities/logger.dart'; import 'package:stackwallet/utilities/text_styles.dart'; import 'package:stackwallet/utilities/util.dart'; +import 'package:stackwallet/whiteLabel.dart'; import 'package:stackwallet/widgets/background.dart'; import 'package:stackwallet/widgets/conditional_parent.dart'; import 'package:stackwallet/widgets/custom_buttons/app_bar_icon_button.dart'; @@ -533,9 +534,10 @@ class _RestoreFromFileViewState extends ConsumerState { Padding( padding: const EdgeInsets - .all(32), + .all( + 32), child: Text( - "Restore Stack Wallet", + "Restore {$WhiteLabel.appName}", style: STextStyles .desktopH3( context), @@ -550,7 +552,7 @@ class _RestoreFromFileViewState extends ConsumerState { Padding( padding: const EdgeInsets - .symmetric( + .symmetric( horizontal: 32), child: diff --git a/lib/pages/settings_views/global_settings_view/stack_backup_views/sub_views/stack_restore_progress_view.dart b/lib/pages/settings_views/global_settings_view/stack_backup_views/sub_views/stack_restore_progress_view.dart index 4825fe4cc..ce4b7c665 100644 --- a/lib/pages/settings_views/global_settings_view/stack_backup_views/sub_views/stack_restore_progress_view.dart +++ b/lib/pages/settings_views/global_settings_view/stack_backup_views/sub_views/stack_restore_progress_view.dart @@ -32,6 +32,7 @@ import 'package:stackwallet/utilities/enums/stack_restoring_status.dart'; import 'package:stackwallet/utilities/logger.dart'; import 'package:stackwallet/utilities/text_styles.dart'; import 'package:stackwallet/utilities/util.dart'; +import 'package:stackwallet/whiteLabel.dart'; import 'package:stackwallet/widgets/conditional_parent.dart'; import 'package:stackwallet/widgets/custom_buttons/app_bar_icon_button.dart'; import 'package:stackwallet/widgets/desktop/primary_button.dart'; @@ -263,7 +264,7 @@ class _StackRestoreProgressViewState }, ), title: Text( - "Restoring Stack wallet", + "Restoring {$WhiteLabel.appName}", style: STextStyles.navBarTitle(context), ), ), diff --git a/lib/pages/settings_views/global_settings_view/support_view.dart b/lib/pages/settings_views/global_settings_view/support_view.dart index d8865a5f3..8922a7a45 100644 --- a/lib/pages/settings_views/global_settings_view/support_view.dart +++ b/lib/pages/settings_views/global_settings_view/support_view.dart @@ -15,6 +15,7 @@ import 'package:stackwallet/utilities/assets.dart'; import 'package:stackwallet/utilities/constants.dart'; import 'package:stackwallet/utilities/text_styles.dart'; import 'package:stackwallet/utilities/util.dart'; +import 'package:stackwallet/whiteLabel.dart'; import 'package:stackwallet/widgets/background.dart'; import 'package:stackwallet/widgets/conditional_parent.dart'; import 'package:stackwallet/widgets/custom_buttons/app_bar_icon_button.dart'; @@ -88,7 +89,7 @@ class SupportView extends StatelessWidget { AboutItem( linkUrl: "https://discord.com/invite/mRPZuXx3At", label: "Discord", - buttonText: "Stack Wallet", + buttonText: "{$WhiteLabel.appName}", iconAsset: Assets.socials.discord, isDesktop: isDesktop, ), diff --git a/lib/pages_desktop_specific/desktop_exchange/exchange_steps/step_scaffold.dart b/lib/pages_desktop_specific/desktop_exchange/exchange_steps/step_scaffold.dart index b1a3e3327..bb4390a4f 100644 --- a/lib/pages_desktop_specific/desktop_exchange/exchange_steps/step_scaffold.dart +++ b/lib/pages_desktop_specific/desktop_exchange/exchange_steps/step_scaffold.dart @@ -33,6 +33,7 @@ import 'package:stackwallet/utilities/assets.dart'; import 'package:stackwallet/utilities/enums/coin_enum.dart'; import 'package:stackwallet/utilities/enums/exchange_rate_type_enum.dart'; import 'package:stackwallet/utilities/text_styles.dart'; +import 'package:stackwallet/whiteLabel.dart'; import 'package:stackwallet/widgets/custom_buttons/app_bar_icon_button.dart'; import 'package:stackwallet/widgets/custom_loading_overlay.dart'; import 'package:stackwallet/widgets/desktop/desktop_dialog.dart'; @@ -316,7 +317,7 @@ class _StepScaffoldState extends ConsumerState { onPressed: onBack, ), secondChild: SecondaryButton( - label: "Send from Stack Wallet", + label: "Send from {$WhiteLabel.appName}", buttonHeight: ButtonHeight.l, onPressed: sendFromStack, ), diff --git a/lib/pages_desktop_specific/desktop_menu.dart b/lib/pages_desktop_specific/desktop_menu.dart index 64faa0d16..b4add69d1 100644 --- a/lib/pages_desktop_specific/desktop_menu.dart +++ b/lib/pages_desktop_specific/desktop_menu.dart @@ -22,6 +22,7 @@ import 'package:stackwallet/utilities/assets.dart'; import 'package:stackwallet/utilities/text_styles.dart'; import 'package:stackwallet/widgets/desktop/desktop_tor_status_button.dart'; import 'package:stackwallet/widgets/desktop/living_stack_icon.dart'; +import 'package:stackwallet/whiteLabel.dart'; enum DesktopMenuItemId { myStack, @@ -138,7 +139,7 @@ class _DesktopMenuState extends ConsumerState { child: SizedBox( height: 28, child: Text( - "Stack Wallet", + "{$WhiteLabel.appName}", style: STextStyles.desktopH2(context).copyWith( fontSize: 18, height: 23.4 / 18, diff --git a/lib/pages_desktop_specific/password/desktop_login_view.dart b/lib/pages_desktop_specific/password/desktop_login_view.dart index 2597704fe..e785129be 100644 --- a/lib/pages_desktop_specific/password/desktop_login_view.dart +++ b/lib/pages_desktop_specific/password/desktop_login_view.dart @@ -29,6 +29,7 @@ import 'package:stackwallet/utilities/flutter_secure_storage_interface.dart'; import 'package:stackwallet/utilities/logger.dart'; import 'package:stackwallet/utilities/text_styles.dart'; import 'package:stackwallet/utilities/util.dart'; +import 'package:stackwallet/whiteLabel.dart'; import 'package:stackwallet/widgets/custom_buttons/blue_text_button.dart'; import 'package:stackwallet/widgets/desktop/desktop_scaffold.dart'; import 'package:stackwallet/widgets/desktop/primary_button.dart'; @@ -200,7 +201,7 @@ class _DesktopLoginViewState extends ConsumerState { height: 42, ), Text( - "Stack Wallet", + "{$WhiteLabel.appName}", style: STextStyles.desktopH1(context), ), const SizedBox( diff --git a/lib/pages_desktop_specific/password/forgotten_passphrase_restore_from_swb.dart b/lib/pages_desktop_specific/password/forgotten_passphrase_restore_from_swb.dart index e61f4ee24..0734868b4 100644 --- a/lib/pages_desktop_specific/password/forgotten_passphrase_restore_from_swb.dart +++ b/lib/pages_desktop_specific/password/forgotten_passphrase_restore_from_swb.dart @@ -30,6 +30,7 @@ import 'package:stackwallet/utilities/constants.dart'; import 'package:stackwallet/utilities/flutter_secure_storage_interface.dart'; import 'package:stackwallet/utilities/logger.dart'; import 'package:stackwallet/utilities/text_styles.dart'; +import 'package:stackwallet/whiteLabel.dart'; import 'package:stackwallet/widgets/custom_buttons/app_bar_icon_button.dart'; import 'package:stackwallet/widgets/desktop/desktop_app_bar.dart'; import 'package:stackwallet/widgets/desktop/desktop_dialog.dart'; @@ -154,7 +155,7 @@ class _ForgottenPassphraseRestoreFromSWBState mainAxisAlignment: MainAxisAlignment.spaceBetween, children: [ Text( - "Restoring Stack wallet", + "Restoring {$WhiteLabel.appName}", style: STextStyles.desktopH3(context), ), ], diff --git a/lib/pages_desktop_specific/settings/settings_menu/desktop_about_view.dart b/lib/pages_desktop_specific/settings/settings_menu/desktop_about_view.dart index eb197ebac..2d7b8f224 100644 --- a/lib/pages_desktop_specific/settings/settings_menu/desktop_about_view.dart +++ b/lib/pages_desktop_specific/settings/settings_menu/desktop_about_view.dart @@ -26,6 +26,7 @@ import 'package:stackwallet/widgets/desktop/desktop_app_bar.dart'; import 'package:stackwallet/widgets/desktop/desktop_scaffold.dart'; import 'package:stackwallet/widgets/rounded_white_container.dart'; import 'package:url_launcher/url_launcher.dart'; +import 'package:stackwallet/whiteLabel.dart'; const kGithubAPI = "https://api.github.com"; const kGithubSearch = "/search/commits"; @@ -165,7 +166,7 @@ class DesktopAboutView extends ConsumerWidget { mainAxisAlignment: MainAxisAlignment.start, children: [ Text( - "Stack Wallet", + "{$WhiteLabel.appName}", style: STextStyles.desktopH3(context), textAlign: TextAlign.start, ), diff --git a/lib/utilities/featured_paynyms.dart b/lib/utilities/featured_paynyms.dart index a5231144d..b7f0d77eb 100644 --- a/lib/utilities/featured_paynyms.dart +++ b/lib/utilities/featured_paynyms.dart @@ -8,6 +8,8 @@ * */ +import 'package:stackwallet/whiteLabel.dart'; + abstract class FeaturedPaynyms { // TODO: replace with actual value // static const String samouraiWalletDevFund = @@ -16,7 +18,7 @@ abstract class FeaturedPaynyms { "PM8TJdQcNk27JpxGRtNR7Hnh8VkJk4Nf17BthLx89fM3iX3UL2YshyaiTAvKgTCVvpgsAgY1DbojkAaUd3Rcn48NEn4uUBuqkaSddgKL8TPAAEQXNuE6"; static Map get featured => { - "Stack Wallet": stackWallet, + "{$WhiteLabel.appName}": stackWallet, // "Samourai Wallet Dev Fund": samouraiWalletDevFund, }; } diff --git a/lib/whiteLabel.dart b/lib/whiteLabel.dart new file mode 100644 index 000000000..6cb0cb43e --- /dev/null +++ b/lib/whiteLabel.dart @@ -0,0 +1,7 @@ +abstract class WhiteLabel { + String get appName => appNamePrefix + appNameSuffix; + + String get appNamePrefix => "Stack"; + + String get appNameSuffix => "Wallet"; +}