diff --git a/asset_sources/default_themes/campfire/light.zip b/asset_sources/default_themes/campfire/light.zip index 029293bbc..0b3dd09b1 100644 Binary files a/asset_sources/default_themes/campfire/light.zip and b/asset_sources/default_themes/campfire/light.zip differ diff --git a/asset_sources/other/ios_launch_image/campfire/LaunchImage.png b/asset_sources/other/ios_launch_image/campfire/LaunchImage.png new file mode 100644 index 000000000..942c30fa7 Binary files /dev/null and b/asset_sources/other/ios_launch_image/campfire/LaunchImage.png differ diff --git a/asset_sources/other/ios_launch_image/campfire/LaunchImage@2x.png b/asset_sources/other/ios_launch_image/campfire/LaunchImage@2x.png new file mode 100644 index 000000000..f5d90b7e2 Binary files /dev/null and b/asset_sources/other/ios_launch_image/campfire/LaunchImage@2x.png differ diff --git a/asset_sources/other/ios_launch_image/campfire/LaunchImage@3x.png b/asset_sources/other/ios_launch_image/campfire/LaunchImage@3x.png new file mode 100644 index 000000000..c7441db43 Binary files /dev/null and b/asset_sources/other/ios_launch_image/campfire/LaunchImage@3x.png differ diff --git a/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage.png b/asset_sources/other/ios_launch_image/stack_duo/LaunchImage.png similarity index 100% rename from ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage.png rename to asset_sources/other/ios_launch_image/stack_duo/LaunchImage.png diff --git a/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@2x.png b/asset_sources/other/ios_launch_image/stack_duo/LaunchImage@2x.png similarity index 100% rename from ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@2x.png rename to asset_sources/other/ios_launch_image/stack_duo/LaunchImage@2x.png diff --git a/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@3x.png b/asset_sources/other/ios_launch_image/stack_duo/LaunchImage@3x.png similarity index 100% rename from ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@3x.png rename to asset_sources/other/ios_launch_image/stack_duo/LaunchImage@3x.png diff --git a/asset_sources/other/ios_launch_image/stack_wallet/LaunchImage.png b/asset_sources/other/ios_launch_image/stack_wallet/LaunchImage.png new file mode 100644 index 000000000..47903b909 Binary files /dev/null and b/asset_sources/other/ios_launch_image/stack_wallet/LaunchImage.png differ diff --git a/asset_sources/other/ios_launch_image/stack_wallet/LaunchImage@2x.png b/asset_sources/other/ios_launch_image/stack_wallet/LaunchImage@2x.png new file mode 100644 index 000000000..863332e3c Binary files /dev/null and b/asset_sources/other/ios_launch_image/stack_wallet/LaunchImage@2x.png differ diff --git a/asset_sources/other/ios_launch_image/stack_wallet/LaunchImage@3x.png b/asset_sources/other/ios_launch_image/stack_wallet/LaunchImage@3x.png new file mode 100644 index 000000000..17c2de611 Binary files /dev/null and b/asset_sources/other/ios_launch_image/stack_wallet/LaunchImage@3x.png differ diff --git a/ios/.gitignore b/ios/.gitignore index e96ef602b..cb9c21eb6 100644 --- a/ios/.gitignore +++ b/ios/.gitignore @@ -30,3 +30,6 @@ Runner/GeneratedPluginRegistrant.* !default.mode2v3 !default.pbxuser !default.perspectivev3 + +# app specific, handled by scripts +Runner/Assets.xcassets/LaunchImage.imageset/*.png diff --git a/lib/pages/add_wallet_views/new_wallet_recovery_phrase_warning_view/new_wallet_recovery_phrase_warning_view.dart b/lib/pages/add_wallet_views/new_wallet_recovery_phrase_warning_view/new_wallet_recovery_phrase_warning_view.dart index c1544fea3..42836e117 100644 --- a/lib/pages/add_wallet_views/new_wallet_recovery_phrase_warning_view/new_wallet_recovery_phrase_warning_view.dart +++ b/lib/pages/add_wallet_views/new_wallet_recovery_phrase_warning_view/new_wallet_recovery_phrase_warning_view.dart @@ -174,7 +174,7 @@ class _NewWalletRecoveryPhraseWarningViewState "write it down. Keep it safe and never share it with " "anyone. Your recovery phrase is the only way you can" " access your funds if you forget your PIN, lose your" - " phone, etc.\n\nStack Wallet does not keep nor is " + " phone, etc.\n\n${AppConfig.appName} does not keep nor is " "able to restore your recover phrase. Only you have " "access to your wallet.", style: isDesktop diff --git a/lib/pages/buy_view/buy_form.dart b/lib/pages/buy_view/buy_form.dart index 1b1239a27..dfc395492 100644 --- a/lib/pages/buy_view/buy_form.dart +++ b/lib/pages/buy_view/buy_form.dart @@ -1155,7 +1155,7 @@ class _BuyFormState extends ConsumerState { ), if (AppConfig.isStackCoin(selectedCrypto?.ticker)) CustomTextButton( - text: "Choose from Stack", + text: "Choose from ${AppConfig.prefix}", onTap: () { try { final coin = AppConfig.getCryptoCurrencyForTicker( diff --git a/lib/pages/exchange_view/exchange_step_views/step_2_view.dart b/lib/pages/exchange_view/exchange_step_views/step_2_view.dart index 111c93240..461dc2935 100644 --- a/lib/pages/exchange_view/exchange_step_views/step_2_view.dart +++ b/lib/pages/exchange_view/exchange_step_views/step_2_view.dart @@ -194,7 +194,7 @@ class _Step2ViewState extends ConsumerState { ), if (AppConfig.isStackCoin(model.receiveTicker)) CustomTextButton( - text: "Choose from Stack", + text: "Choose from ${AppConfig.prefix}", onTap: () { try { final coin = AppConfig.coins.firstWhere( @@ -480,7 +480,7 @@ class _Step2ViewState extends ConsumerState { ), if (AppConfig.isStackCoin(model.sendTicker)) CustomTextButton( - text: "Choose from Stack", + text: "Choose from ${AppConfig.prefix}", onTap: () { try { final coin = AppConfig.coins.firstWhere( diff --git a/lib/pages/exchange_view/send_from_view.dart b/lib/pages/exchange_view/send_from_view.dart index 680330753..36f9eb4c1 100644 --- a/lib/pages/exchange_view/send_from_view.dart +++ b/lib/pages/exchange_view/send_from_view.dart @@ -14,10 +14,9 @@ import 'dart:io'; import 'package:flutter/material.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:flutter_svg/svg.dart'; + +import '../../app_config.dart'; import '../../models/exchange/response_objects/trade.dart'; -import 'confirm_change_now_send.dart'; -import '../home_view/home_view.dart'; -import '../send_view/sub_widgets/building_transaction_dialog.dart'; import '../../pages_desktop_specific/desktop_exchange/desktop_exchange_view.dart'; import '../../providers/providers.dart'; import '../../route_generator.dart'; @@ -43,6 +42,9 @@ import '../../widgets/desktop/desktop_dialog_close_button.dart'; import '../../widgets/expandable.dart'; import '../../widgets/rounded_white_container.dart'; import '../../widgets/stack_dialog.dart'; +import '../home_view/home_view.dart'; +import '../send_view/sub_widgets/building_transaction_dialog.dart'; +import 'confirm_change_now_send.dart'; class SendFromView extends ConsumerStatefulWidget { const SendFromView({ @@ -135,7 +137,7 @@ class _SendFromViewState extends ConsumerState { left: 32, ), child: Text( - "Send from Stack", + "Send from ${AppConfig.prefix}", style: STextStyles.desktopH3(context), ), ), diff --git a/lib/pages/exchange_view/trade_details_view.dart b/lib/pages/exchange_view/trade_details_view.dart index 7c2317768..47bfb980b 100644 --- a/lib/pages/exchange_view/trade_details_view.dart +++ b/lib/pages/exchange_view/trade_details_view.dart @@ -264,7 +264,7 @@ class _TradeDetailsViewState extends ConsumerState { trade.status == "waiting" || trade.status == "Waiting")) SecondaryButton( - label: "Send from Stack", + label: "Send from ${AppConfig.prefix}", buttonHeight: ButtonHeight.l, onPressed: () { CryptoCurrency coin; @@ -1379,7 +1379,7 @@ class _TradeDetailsViewState extends ConsumerState { trade.status == "waiting" || trade.status == "Waiting")) SecondaryButton( - label: "Send from Stack", + label: "Send from ${AppConfig.prefix}", onPressed: () { CryptoCurrency coin; try { diff --git a/lib/pages/intro_view.dart b/lib/pages/intro_view.dart index 27e1fea48..7a97eb4a0 100644 --- a/lib/pages/intro_view.dart +++ b/lib/pages/intro_view.dart @@ -171,7 +171,7 @@ class _IntroViewState extends ConsumerState { ), if (isDesktop) SecondaryButton( - label: "Restore from Stack backup", + label: "Restore from ${AppConfig.prefix} backup", onPressed: () { Navigator.of(context).pushNamed( CreatePasswordView.routeName, @@ -314,7 +314,7 @@ class GetStartedButton extends StatelessWidget { ); }, child: Text( - "Create new Stack", + "Create new ${AppConfig.prefix}", style: STextStyles.button(context).copyWith(fontSize: 20), ), ), diff --git a/lib/pages/settings_views/global_settings_view/advanced_views/advanced_settings_view.dart b/lib/pages/settings_views/global_settings_view/advanced_views/advanced_settings_view.dart index 3d5413798..e47c9e209 100644 --- a/lib/pages/settings_views/global_settings_view/advanced_views/advanced_settings_view.dart +++ b/lib/pages/settings_views/global_settings_view/advanced_views/advanced_settings_view.dart @@ -12,6 +12,7 @@ import 'package:flutter/material.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:tuple/tuple.dart'; +import '../../../../app_config.dart'; import '../../../../providers/global/prefs_provider.dart'; import '../../../../themes/stack_colors.dart'; import '../../../../utilities/constants.dart'; @@ -218,7 +219,7 @@ class AdvancedSettingsView extends StatelessWidget { text: TextSpan( children: [ TextSpan( - text: "Stack Experience", + text: "${AppConfig.prefix} Experience", style: STextStyles.titleBold12(context), ), TextSpan( diff --git a/lib/pages/settings_views/global_settings_view/global_settings_view.dart b/lib/pages/settings_views/global_settings_view/global_settings_view.dart index 38b85edbe..082d03429 100644 --- a/lib/pages/settings_views/global_settings_view/global_settings_view.dart +++ b/lib/pages/settings_views/global_settings_view/global_settings_view.dart @@ -99,7 +99,7 @@ class GlobalSettingsView extends StatelessWidget { SettingsListButton( iconAssetName: Assets.svg.downloadFolder, iconSize: 14, - title: "Stack backup & restore", + title: "${AppConfig.prefix} backup & restore", onPressed: () { Navigator.push( context, @@ -113,9 +113,9 @@ class GlobalSettingsView extends StatelessWidget { biometricsCancelButtonString: "CANCEL", biometricsLocalizedReason: - "Authenticate to access Stack backup & restore settings", + "Authenticate to access ${AppConfig.prefix} backup & restore settings", biometricsAuthenticationTitle: - "Stack backup", + "${AppConfig.prefix} backup", ), settings: const RouteSettings( name: "/swblockscreen", diff --git a/lib/pages/settings_views/global_settings_view/stack_backup_views/auto_backup_view.dart b/lib/pages/settings_views/global_settings_view/stack_backup_views/auto_backup_view.dart index fdfda272c..f41891bb6 100644 --- a/lib/pages/settings_views/global_settings_view/stack_backup_views/auto_backup_view.dart +++ b/lib/pages/settings_views/global_settings_view/stack_backup_views/auto_backup_view.dart @@ -14,6 +14,7 @@ import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:intl/intl.dart'; import 'package:url_launcher/url_launcher.dart'; +import '../../../../app_config.dart'; import '../../../../providers/global/auto_swb_service_provider.dart'; import '../../../../providers/providers.dart'; import '../../../../themes/stack_colors.dart'; @@ -316,7 +317,7 @@ class _AutoBackupViewState extends ConsumerState { children: [ const TextSpan( text: - "Auto Backup is a custom Stack Wallet feature that offers a convenient backup of your data.\n\nTo ensure maximum security, we recommend using a unique password that you haven't used anywhere else on the internet before. Your password is not stored.\n\nFor more information, please see our website ", + "Auto Backup is a custom ${AppConfig.appName} feature that offers a convenient backup of your data.\n\nTo ensure maximum security, we recommend using a unique password that you haven't used anywhere else on the internet before. Your password is not stored.\n\nFor more information, please see our website ", ), TextSpan( text: "stackwallet.com.", diff --git a/lib/pages/settings_views/global_settings_view/stack_backup_views/create_auto_backup_view.dart b/lib/pages/settings_views/global_settings_view/stack_backup_views/create_auto_backup_view.dart index 1583950c5..4e1fdea36 100644 --- a/lib/pages/settings_views/global_settings_view/stack_backup_views/create_auto_backup_view.dart +++ b/lib/pages/settings_views/global_settings_view/stack_backup_views/create_auto_backup_view.dart @@ -18,6 +18,7 @@ import 'package:flutter_svg/svg.dart'; import 'package:stack_wallet_backup/stack_wallet_backup.dart'; import 'package:zxcvbn/zxcvbn.dart'; +import '../../../../app_config.dart'; import '../../../../notifications/show_flush_bar.dart'; import '../../../../providers/global/prefs_provider.dart'; import '../../../../providers/global/secure_store_provider.dart'; @@ -651,12 +652,12 @@ class _EnableAutoBackupViewState extends ConsumerState { builder: (_) => Platform.isAndroid ? StackOkDialog( title: - "Stack Auto Backup enabled and saved to:", + "${AppConfig.prefix} Auto Backup enabled and saved to:", message: fileToSave, ) : const StackOkDialog( title: - "Stack Auto Backup enabled!", + "${AppConfig.prefix} Auto Backup enabled!", ), ); if (mounted) { diff --git a/lib/pages/settings_views/global_settings_view/stack_backup_views/create_backup_view.dart b/lib/pages/settings_views/global_settings_view/stack_backup_views/create_backup_view.dart index e762d9f5b..4bf75c0bf 100644 --- a/lib/pages/settings_views/global_settings_view/stack_backup_views/create_backup_view.dart +++ b/lib/pages/settings_views/global_settings_view/stack_backup_views/create_backup_view.dart @@ -17,6 +17,7 @@ import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:flutter_svg/svg.dart'; import 'package:zxcvbn/zxcvbn.dart'; +import '../../../../app_config.dart'; import '../../../../notifications/show_flush_bar.dart'; import '../../../../providers/global/secure_store_provider.dart'; import '../../../../themes/stack_colors.dart'; @@ -774,7 +775,7 @@ class _RestoreFromFileViewState extends State { height: 26, ), Text( - "Stack backup saved to: \n", + "${AppConfig.prefix} backup saved to: \n", style: STextStyles .desktopH3(context), ), diff --git a/lib/pages/settings_views/global_settings_view/stack_backup_views/dialogs/cancel_stack_restore_dialog.dart b/lib/pages/settings_views/global_settings_view/stack_backup_views/dialogs/cancel_stack_restore_dialog.dart index f48c0017c..7d944e278 100644 --- a/lib/pages/settings_views/global_settings_view/stack_backup_views/dialogs/cancel_stack_restore_dialog.dart +++ b/lib/pages/settings_views/global_settings_view/stack_backup_views/dialogs/cancel_stack_restore_dialog.dart @@ -10,6 +10,7 @@ import 'package:flutter/material.dart'; +import '../../../../../app_config.dart'; import '../../../../../themes/stack_colors.dart'; import '../../../../../utilities/text_styles.dart'; import '../../../../../utilities/util.dart'; @@ -89,7 +90,7 @@ class CancelStackRestoreDialog extends StatelessWidget { .snackBarBackError, child: Text( "If you cancel, the restore will not complete, and " - "the wallets will not appear in your Stack.", + "the wallets will not appear in your ${AppConfig.prefix}.", style: STextStyles.desktopTextMedium(context), ), ), diff --git a/lib/pages/settings_views/global_settings_view/stack_backup_views/edit_auto_backup_view.dart b/lib/pages/settings_views/global_settings_view/stack_backup_views/edit_auto_backup_view.dart index 5d495b3d9..ae88abd24 100644 --- a/lib/pages/settings_views/global_settings_view/stack_backup_views/edit_auto_backup_view.dart +++ b/lib/pages/settings_views/global_settings_view/stack_backup_views/edit_auto_backup_view.dart @@ -20,6 +20,7 @@ import 'package:flutter_svg/svg.dart'; import 'package:stack_wallet_backup/stack_wallet_backup.dart'; import 'package:zxcvbn/zxcvbn.dart'; +import '../../../../app_config.dart'; import '../../../../notifications/show_flush_bar.dart'; import '../../../../providers/global/prefs_provider.dart'; import '../../../../providers/global/secure_store_provider.dart'; @@ -221,10 +222,11 @@ class _EditAutoBackupViewState extends ConsumerState { barrierDismissible: false, builder: (_) => Platform.isAndroid ? StackOkDialog( - title: "Stack Auto Backup saved to:", + title: "${AppConfig.prefix} Auto Backup saved to:", message: fileToSave, ) - : const StackOkDialog(title: "Stack Auto Backup saved"), + : const StackOkDialog( + title: "${AppConfig.prefix} Auto Backup saved"), ); if (mounted) { passwordController.text = ""; diff --git a/lib/pages/settings_views/global_settings_view/stack_backup_views/helpers/swb_file_system.dart b/lib/pages/settings_views/global_settings_view/stack_backup_views/helpers/swb_file_system.dart index 2b480d59b..7282a802a 100644 --- a/lib/pages/settings_views/global_settings_view/stack_backup_views/helpers/swb_file_system.dart +++ b/lib/pages/settings_views/global_settings_view/stack_backup_views/helpers/swb_file_system.dart @@ -14,6 +14,8 @@ import 'package:file_picker/file_picker.dart'; import 'package:flutter/material.dart'; import 'package:path_provider/path_provider.dart'; import 'package:permission_handler/permission_handler.dart'; + +import '../../../../../app_config.dart'; import '../../../../../utilities/util.dart'; class SWBFileSystem { @@ -39,17 +41,18 @@ class SWBFileSystem { // debugPrint(rootPath!.absolute.toString()); late Directory sampleFolder; + const dirName = "${AppConfig.prefix}_backup"; if (Platform.isIOS) { sampleFolder = Directory(rootPath!.path); } else if (Platform.isAndroid) { - sampleFolder = Directory('${rootPath!.path}Documents/Stack_backups'); + sampleFolder = Directory('${rootPath!.path}Documents/$dirName'); } else if (Platform.isLinux) { - sampleFolder = Directory('${rootPath!.path}/Stack_backups'); + sampleFolder = Directory('${rootPath!.path}/$dirName'); } else if (Platform.isWindows) { - sampleFolder = Directory('${rootPath!.path}/Stack_backups'); + sampleFolder = Directory('${rootPath!.path}/$dirName'); } else if (Platform.isMacOS) { - sampleFolder = Directory('${rootPath!.path}/Stack_backups'); + sampleFolder = Directory('${rootPath!.path}/$dirName'); } try { diff --git a/lib/pages/settings_views/global_settings_view/stack_backup_views/restore_from_encrypted_string_view.dart b/lib/pages/settings_views/global_settings_view/stack_backup_views/restore_from_encrypted_string_view.dart index 881319202..9eff26a7e 100644 --- a/lib/pages/settings_views/global_settings_view/stack_backup_views/restore_from_encrypted_string_view.dart +++ b/lib/pages/settings_views/global_settings_view/stack_backup_views/restore_from_encrypted_string_view.dart @@ -14,6 +14,7 @@ import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:flutter_svg/svg.dart'; import 'package:tuple/tuple.dart'; +import '../../../../app_config.dart'; import '../../../../notifications/show_flush_bar.dart'; import '../../../../route_generator.dart'; import '../../../../themes/stack_colors.dart'; @@ -205,7 +206,7 @@ class _RestoreFromEncryptedStringViewState color: Colors.transparent, child: Center( child: Text( - "Decrypting Stack backup file", + "Decrypting ${AppConfig.prefix} backup file", style: STextStyles.pageTitleH2( 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 0f9cc5b39..c994d6c7c 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 @@ -338,7 +338,7 @@ class _RestoreFromFileViewState extends ConsumerState { color: Colors.transparent, child: Center( child: Text( - "Decrypting Stack backup file", + "Decrypting ${AppConfig.prefix} backup file", style: STextStyles.pageTitleH2( context, ).copyWith( @@ -452,7 +452,7 @@ class _RestoreFromFileViewState extends ConsumerState { color: Colors.transparent, child: Center( child: Text( - "Decrypting Stack backup file", + "Decrypting ${AppConfig.prefix} backup file", style: STextStyles.pageTitleH2( context, ).copyWith( diff --git a/lib/pages/settings_views/global_settings_view/stack_backup_views/stack_backup_view.dart b/lib/pages/settings_views/global_settings_view/stack_backup_views/stack_backup_view.dart index ac90e486a..da5c0f411 100644 --- a/lib/pages/settings_views/global_settings_view/stack_backup_views/stack_backup_view.dart +++ b/lib/pages/settings_views/global_settings_view/stack_backup_views/stack_backup_view.dart @@ -10,9 +10,8 @@ import 'package:flutter/material.dart'; import 'package:flutter_svg/svg.dart'; -import 'auto_backup_view.dart'; -import 'create_backup_view.dart'; -import 'restore_from_file_view.dart'; + +import '../../../../app_config.dart'; import '../../../../themes/stack_colors.dart'; import '../../../../utilities/assets.dart'; import '../../../../utilities/constants.dart'; @@ -20,6 +19,9 @@ import '../../../../utilities/text_styles.dart'; import '../../../../widgets/background.dart'; import '../../../../widgets/custom_buttons/app_bar_icon_button.dart'; import '../../../../widgets/rounded_white_container.dart'; +import 'auto_backup_view.dart'; +import 'create_backup_view.dart'; +import 'restore_from_file_view.dart'; class StackBackupView extends StatelessWidget { const StackBackupView({ @@ -42,7 +44,7 @@ class StackBackupView extends StatelessWidget { }, ), title: Text( - "Stack backup", + "${AppConfig.prefix} backup", style: STextStyles.navBarTitle(context), ), ), diff --git a/lib/pages/settings_views/wallet_settings_view/wallet_backup_views/wallet_backup_view.dart b/lib/pages/settings_views/wallet_settings_view/wallet_backup_views/wallet_backup_view.dart index 0c91eda12..95538ed10 100644 --- a/lib/pages/settings_views/wallet_settings_view/wallet_backup_views/wallet_backup_view.dart +++ b/lib/pages/settings_views/wallet_settings_view/wallet_backup_views/wallet_backup_view.dart @@ -170,7 +170,11 @@ class _Mnemonic extends ConsumerWidget { child: Padding( padding: const EdgeInsets.all(12), child: Text( - "Please write down your backup key. Keep it safe and never share it with anyone. Your backup key is the only way you can access your funds if you forget your PIN, lose your phone, etc.\n\nStack Wallet does not keep nor is able to restore your backup key. Only you have access to your wallet.", + "Please write down your backup key. Keep it safe and never share " + "it with anyone. Your backup key is the only way you can access" + " your funds if you forget your PIN, lose your phone, etc.\n\n" + "${AppConfig.appName} does not keep nor is able to restore your" + " backup key. Only you have access to your wallet.", style: STextStyles.label(context), ), ), diff --git a/lib/pages/settings_views/wallet_settings_view/wallet_settings_wallet_settings/delete_wallet_warning_view.dart b/lib/pages/settings_views/wallet_settings_view/wallet_settings_wallet_settings/delete_wallet_warning_view.dart index b33c44c9c..afb5137b4 100644 --- a/lib/pages/settings_views/wallet_settings_view/wallet_settings_wallet_settings/delete_wallet_warning_view.dart +++ b/lib/pages/settings_views/wallet_settings_view/wallet_settings_wallet_settings/delete_wallet_warning_view.dart @@ -11,6 +11,7 @@ import 'package:flutter/material.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; +import '../../../../app_config.dart'; import '../../../../providers/providers.dart'; import '../../../../themes/stack_colors.dart'; import '../../../../utilities/text_styles.dart'; @@ -69,7 +70,11 @@ class DeleteWalletWarningView extends ConsumerWidget { .extension()! .warningBackground, child: Text( - "You are going to permanently delete your wallet.\n\nIf you delete your wallet, the only way you can have access to your funds is by using your backup key.\n\nStack Wallet does not keep nor is able to restore your backup key or your wallet.\n\nPLEASE SAVE YOUR BACKUP KEY.", + "You are going to permanently delete your wallet.\n\n" + "If you delete your wallet, the only way you can have access" + " to your funds is by using your backup key.\n\n" + "${AppConfig.appName} does not keep nor is able to restore " + "your backup key or your wallet.\n\nPLEASE SAVE YOUR BACKUP KEY.", style: STextStyles.baseXS(context).copyWith( color: Theme.of(context) .extension()! diff --git a/lib/pages/wallet_view/transaction_views/all_transactions_view.dart b/lib/pages/wallet_view/transaction_views/all_transactions_view.dart index 232e3ee2c..5afd82597 100644 --- a/lib/pages/wallet_view/transaction_views/all_transactions_view.dart +++ b/lib/pages/wallet_view/transaction_views/all_transactions_view.dart @@ -960,8 +960,7 @@ class _DesktopTransactionCardRowState unawaited( showFloatingFlushBar( context: context, - message: - "Restored Epic funds from your Seed have no Data.\nUse Stack Backup to keep your transaction history.", + message: "Restored Epic funds from your Seed have no Data.", type: FlushBarType.warning, duration: const Duration(seconds: 5), ), diff --git a/lib/pages_desktop_specific/desktop_exchange/exchange_steps/subwidgets/desktop_step_2.dart b/lib/pages_desktop_specific/desktop_exchange/exchange_steps/subwidgets/desktop_step_2.dart index 6c84996da..094ee452d 100644 --- a/lib/pages_desktop_specific/desktop_exchange/exchange_steps/subwidgets/desktop_step_2.dart +++ b/lib/pages_desktop_specific/desktop_exchange/exchange_steps/subwidgets/desktop_step_2.dart @@ -326,7 +326,7 @@ class _DesktopStep2State extends ConsumerState { ), )) CustomTextButton( - text: "Choose from Stack", + text: "Choose from ${AppConfig.prefix}", onTap: selectRecipientAddressFromStack, ), ], @@ -472,7 +472,7 @@ class _DesktopStep2State extends ConsumerState { ), )) CustomTextButton( - text: "Choose from Stack", + text: "Choose from ${AppConfig.prefix}", onTap: selectRefundAddressFromStack, ), ], diff --git a/lib/pages_desktop_specific/desktop_exchange/subwidgets/desktop_choose_from_stack.dart b/lib/pages_desktop_specific/desktop_exchange/subwidgets/desktop_choose_from_stack.dart index bbe22138e..1dec08ff8 100644 --- a/lib/pages_desktop_specific/desktop_exchange/subwidgets/desktop_choose_from_stack.dart +++ b/lib/pages_desktop_specific/desktop_exchange/subwidgets/desktop_choose_from_stack.dart @@ -13,6 +13,7 @@ import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:flutter_svg/svg.dart'; import 'package:tuple/tuple.dart'; +import '../../../app_config.dart'; import '../../../providers/providers.dart'; import '../../../themes/stack_colors.dart'; import '../../../utilities/amount/amount.dart'; @@ -87,7 +88,7 @@ class _DesktopChooseFromStackState crossAxisAlignment: CrossAxisAlignment.start, children: [ Text( - "Choose from Stack", + "Choose from ${AppConfig.prefix}", style: STextStyles.desktopH3(context), ), const SizedBox( diff --git a/lib/pages_desktop_specific/my_stack_view/wallet_view/sub_widgets/more_features/more_features_dialog.dart b/lib/pages_desktop_specific/my_stack_view/wallet_view/sub_widgets/more_features/more_features_dialog.dart index 156b903a1..6072612bb 100644 --- a/lib/pages_desktop_specific/my_stack_view/wallet_view/sub_widgets/more_features/more_features_dialog.dart +++ b/lib/pages_desktop_specific/my_stack_view/wallet_view/sub_widgets/more_features/more_features_dialog.dart @@ -12,6 +12,7 @@ import 'package:flutter/material.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:flutter_svg/flutter_svg.dart'; +import '../../../../../app_config.dart'; import '../../../../../db/sqlite/firo_cache.dart'; import '../../../../../providers/db/main_db_provider.dart'; import '../../../../../providers/global/prefs_provider.dart'; @@ -281,7 +282,7 @@ class _MoreFeaturesDialogState extends ConsumerState { if (wallet is OrdinalsInterface) _MoreFeaturesItem( label: "Ordinals", - detail: "View and control your ordinals in Stack", + detail: "View and control your ordinals in ${AppConfig.prefix}", iconAsset: Assets.svg.ordinal, onPressed: () async => widget.onOrdinalsPressed?.call(), ), diff --git a/lib/pages_desktop_specific/password/delete_password_warning_view.dart b/lib/pages_desktop_specific/password/delete_password_warning_view.dart index 1eab70a5a..e8a4c5256 100644 --- a/lib/pages_desktop_specific/password/delete_password_warning_view.dart +++ b/lib/pages_desktop_specific/password/delete_password_warning_view.dart @@ -15,6 +15,7 @@ import 'package:flutter/material.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:isar/isar.dart'; +import '../../app_config.dart'; import '../../db/hive/db.dart'; import '../../notifications/show_flush_bar.dart'; import '../../pages/intro_view.dart'; @@ -143,7 +144,7 @@ class _ForgotPasswordDesktopViewState ), TextSpan( text: widget.shouldCreateNew - ? "create a new Stack" + ? "create a new ${AppConfig.prefix}" : "restore from backup", style: STextStyles.desktopTextSmallBold(context), ), diff --git a/lib/pages_desktop_specific/password/forgot_password_desktop_view.dart b/lib/pages_desktop_specific/password/forgot_password_desktop_view.dart index 235f14563..68cf1476f 100644 --- a/lib/pages_desktop_specific/password/forgot_password_desktop_view.dart +++ b/lib/pages_desktop_specific/password/forgot_password_desktop_view.dart @@ -74,7 +74,9 @@ class _ForgotPasswordDesktopViewState SizedBox( width: 400, child: Text( - "${AppConfig.appName} does not store your password. Create new wallet or use a Stack backup file to restore your wallet.", + "${AppConfig.appName} does not store your password. " + "Create new wallet or use a ${AppConfig.prefix} " + "backup file to restore your wallet.", textAlign: TextAlign.center, style: STextStyles.desktopTextSmall(context).copyWith( color: Theme.of(context) @@ -87,7 +89,7 @@ class _ForgotPasswordDesktopViewState height: 48, ), PrimaryButton( - label: "Create new Stack", + label: "Create new ${AppConfig.prefix}", onPressed: () { const shouldCreateNew = true; Navigator.of(context).pushNamed( @@ -100,7 +102,7 @@ class _ForgotPasswordDesktopViewState height: 24, ), SecondaryButton( - label: "Restore from Stack backup", + label: "Restore from ${AppConfig.prefix} backup", onPressed: () { const shouldCreateNew = false; Navigator.of(context).pushNamed( 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 26b42941d..a20660779 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 @@ -94,7 +94,7 @@ class _ForgottenPassphraseRestoreFromSWBState color: Colors.transparent, child: Center( child: Text( - "Decrypting Stack backup file", + "Decrypting ${AppConfig.prefix} backup file", style: STextStyles.pageTitleH2(context).copyWith( color: Theme.of(context).extension()!.textWhite, @@ -245,7 +245,7 @@ class _ForgottenPassphraseRestoreFromSWBState height: 32, ), Text( - "Use your Stack backup file to restore your wallets, address book, and wallet preferences.", + "Use your ${AppConfig.prefix} backup file to restore your wallets, address book, and wallet preferences.", textAlign: TextAlign.center, style: STextStyles.desktopTextSmall(context).copyWith( color: Theme.of(context) diff --git a/lib/pages_desktop_specific/settings/settings_menu/advanced_settings/advanced_settings.dart b/lib/pages_desktop_specific/settings/settings_menu/advanced_settings/advanced_settings.dart index 029c5e294..d5a46cbf2 100644 --- a/lib/pages_desktop_specific/settings/settings_menu/advanced_settings/advanced_settings.dart +++ b/lib/pages_desktop_specific/settings/settings_menu/advanced_settings/advanced_settings.dart @@ -12,6 +12,7 @@ import 'package:flutter/material.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:flutter_svg/svg.dart'; +import '../../../../app_config.dart'; import '../../../../pages/settings_views/global_settings_view/advanced_views/manage_coin_units/manage_coin_units_view.dart'; import '../../../../providers/global/prefs_provider.dart'; import '../../../../themes/stack_colors.dart'; @@ -184,7 +185,7 @@ class _AdvancedSettings extends ConsumerState { crossAxisAlignment: CrossAxisAlignment.start, children: [ Text( - "Stack Experience", + "${AppConfig.prefix} Experience", style: STextStyles.desktopTextExtraSmall( context, ).copyWith( diff --git a/lib/pages_desktop_specific/settings/settings_menu/backup_and_restore/create_auto_backup.dart b/lib/pages_desktop_specific/settings/settings_menu/backup_and_restore/create_auto_backup.dart index e7225d628..bf5f3e009 100644 --- a/lib/pages_desktop_specific/settings/settings_menu/backup_and_restore/create_auto_backup.dart +++ b/lib/pages_desktop_specific/settings/settings_menu/backup_and_restore/create_auto_backup.dart @@ -20,6 +20,7 @@ import 'package:flutter_svg/svg.dart'; import 'package:stack_wallet_backup/stack_wallet_backup.dart'; import 'package:zxcvbn/zxcvbn.dart'; +import '../../../../app_config.dart'; import '../../../../notifications/show_flush_bar.dart'; import '../../../../pages/settings_views/global_settings_view/stack_backup_views/helpers/restore_create_backup.dart'; import '../../../../pages/settings_views/global_settings_view/stack_backup_views/helpers/swb_file_system.dart'; @@ -776,7 +777,7 @@ class _CreateAutoBackup extends ConsumerState { if (Platform.isAndroid) { return StackOkDialog( title: - "Stack Auto Backup enabled and saved to:", + "${AppConfig.prefix} Auto Backup enabled and saved to:", message: fileToSave, ); } else if (Util.isDesktop) { @@ -800,7 +801,7 @@ class _CreateAutoBackup extends ConsumerState { .spaceBetween, children: [ Text( - "Stack Auto Backup enabled!", + "${AppConfig.prefix} Auto Backup enabled!", style: STextStyles.desktopH3( context, @@ -834,7 +835,8 @@ class _CreateAutoBackup extends ConsumerState { ); } else { return const StackOkDialog( - title: "Stack Auto Backup enabled!", + title: + "${AppConfig.prefix} Auto Backup enabled!", ); } }, diff --git a/lib/services/debug_service.dart b/lib/services/debug_service.dart index 189c4f19f..4d6e51553 100644 --- a/lib/services/debug_service.dart +++ b/lib/services/debug_service.dart @@ -15,6 +15,7 @@ import 'package:event_bus/event_bus.dart'; import 'package:flutter/material.dart'; import 'package:isar/isar.dart'; +import '../app_config.dart'; import '../models/isar/models/log.dart'; import '../utilities/logger.dart'; @@ -98,7 +99,7 @@ class DebugService extends ChangeNotifier { Future exportToFile(String directory, EventBus eventBus) async { final now = DateTime.now(); final filename = - "Stack_Wallet_logs_${now.year}_${now.month}_${now.day}_${now.hour}_${now.minute}_${now.second}.txt"; + "${AppConfig.prefix}_Wallet_logs_${now.year}_${now.month}_${now.day}_${now.hour}_${now.minute}_${now.second}.txt"; final filepath = "$directory/$filename"; final File file = await File(filepath).create(); diff --git a/lib/themes/theme_service.dart b/lib/themes/theme_service.dart index f54cddb35..2d2ae212b 100644 --- a/lib/themes/theme_service.dart +++ b/lib/themes/theme_service.dart @@ -31,7 +31,7 @@ final pThemeService = Provider((ref) { }); class ThemeService { - static const _currentDefaultThemeVersion = 11; + static const _currentDefaultThemeVersion = 15; ThemeService._(); static ThemeService? _instance; static ThemeService get instance => _instance ??= ThemeService._(); diff --git a/lib/widgets/transaction_card.dart b/lib/widgets/transaction_card.dart index b83b09696..cab5043d6 100644 --- a/lib/widgets/transaction_card.dart +++ b/lib/widgets/transaction_card.dart @@ -181,8 +181,7 @@ class _TransactionCardState extends ConsumerState { unawaited( showFloatingFlushBar( context: context, - message: - "Restored Epic funds from your Seed have no Data.\nUse Stack Backup to keep your transaction history.", + message: "Restored Epic funds from your Seed have no Data.", type: FlushBarType.warning, duration: const Duration(seconds: 5), ), diff --git a/pubspec.lock b/pubspec.lock index 92540b4b2..f311f27ea 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -1064,26 +1064,26 @@ packages: dependency: transitive description: name: leak_tracker - sha256: "78eb209deea09858f5269f5a5b02be4049535f568c07b275096836f01ea323fa" + sha256: "7f0df31977cb2c0b88585095d168e689669a2cc9b97c309665e3386f3e9d341a" url: "https://pub.dev" source: hosted - version: "10.0.0" + version: "10.0.4" leak_tracker_flutter_testing: dependency: transitive description: name: leak_tracker_flutter_testing - sha256: b46c5e37c19120a8a01918cfaf293547f47269f7cb4b0058f21531c2465d6ef0 + sha256: "06e98f569d004c1315b991ded39924b21af84cf14cc94791b8aea337d25b57f8" url: "https://pub.dev" source: hosted - version: "2.0.1" + version: "3.0.3" leak_tracker_testing: dependency: transitive description: name: leak_tracker_testing - sha256: a597f72a664dbd293f3bfc51f9ba69816f84dcd403cdac7066cb3f6003f3ab47 + sha256: "6ba465d5d76e67ddf503e1161d1f4a6bc42306f9d66ca1e8f079a47290fb06d3" url: "https://pub.dev" source: hosted - version: "2.0.1" + version: "3.0.1" lelantus: dependency: "direct main" description: @@ -1151,10 +1151,10 @@ packages: dependency: "direct main" description: name: meta - sha256: d584fa6707a52763a52446f02cc621b077888fb63b93bbcb1143a7be5a0c0c04 + sha256: "7687075e408b093f36e6bbf6c91878cc0d4cd10f409506f7bc996f68220b9136" url: "https://pub.dev" source: hosted - version: "1.11.0" + version: "1.12.0" mime: dependency: transitive description: @@ -1736,26 +1736,26 @@ packages: dependency: transitive description: name: test - sha256: a1f7595805820fcc05e5c52e3a231aedd0b72972cb333e8c738a8b1239448b6f + sha256: "7ee446762c2c50b3bd4ea96fe13ffac69919352bd3b4b17bac3f3465edc58073" url: "https://pub.dev" source: hosted - version: "1.24.9" + version: "1.25.2" test_api: dependency: transitive description: name: test_api - sha256: "5c2f730018264d276c20e4f1503fd1308dfbbae39ec8ee63c5236311ac06954b" + sha256: "9955ae474176f7ac8ee4e989dadfb411a58c30415bcfb648fa04b2b8a03afa7f" url: "https://pub.dev" source: hosted - version: "0.6.1" + version: "0.7.0" test_core: dependency: transitive description: name: test_core - sha256: a757b14fc47507060a162cc2530d9a4a2f92f5100a952c7443b5cad5ef5b106a + sha256: "2bc4b4ecddd75309300d8096f781c0e3280ca1ef85beda558d33fcbedc2eead4" url: "https://pub.dev" source: hosted - version: "0.5.9" + version: "0.6.0" tezart: dependency: "direct main" description: @@ -1954,10 +1954,10 @@ packages: dependency: transitive description: name: vm_service - sha256: b3d56ff4341b8f182b96aceb2fa20e3dcb336b9f867bc0eafc0de10f1048e957 + sha256: "3923c89304b715fb1eb6423f017651664a03bf5f4b29983627c4da791f74a4ec" url: "https://pub.dev" source: hosted - version: "13.0.0" + version: "14.2.1" wakelock: dependency: "direct main" description: diff --git a/scripts/app_config/platforms/ios/platform_config.sh b/scripts/app_config/platforms/ios/platform_config.sh index b60d3615c..c2842d1d5 100755 --- a/scripts/app_config/platforms/ios/platform_config.sh +++ b/scripts/app_config/platforms/ios/platform_config.sh @@ -15,3 +15,22 @@ done # Configure ios for Duo. sed -i '' "s/${APP_NAME_PLACEHOLDER}/${NEW_NAME}/g" "${APP_PROJECT_ROOT_DIR}/${IOS_TF_0}" sed -i '' "s/${APP_ID_PLACEHOLDER}/${NEW_APP_ID}/g" "${APP_PROJECT_ROOT_DIR}/${IOS_TF_1}" + +# use app specific launch images +LAUNCH_IMAGES_DIR="${APP_PROJECT_ROOT_DIR}/ios/Runner/Assets.xcassets/LaunchImage.imageset" +for file in "${LAUNCH_IMAGES_DIR}"/*.png; +do + # Check if the file exists to avoid errors if no PNG files are found + if [ -f "${file}" ]; then + rm "${file}" + fi +done + +LAUNCH_IMAGES_TEMPLATES_DIR="${APP_PROJECT_ROOT_DIR}/asset_sources/other/ios_launch_image/${NEW_BASIC_NAME}" +for file in "${LAUNCH_IMAGES_TEMPLATES_DIR}"/*.png; +do + # Check if the file exists to avoid errors if no PNG files are found + if [ -f "${file}" ]; then + cp "${file}" "${LAUNCH_IMAGES_DIR}/" + fi +done \ No newline at end of file