diff --git a/lib/pages_desktop_specific/home/desktop_settings_view.dart b/lib/pages_desktop_specific/home/desktop_settings_view.dart index 34cb07f27..9b3f897a9 100644 --- a/lib/pages_desktop_specific/home/desktop_settings_view.dart +++ b/lib/pages_desktop_specific/home/desktop_settings_view.dart @@ -1,10 +1,10 @@ import 'package:flutter/material.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; -import 'package:stackwallet/pages_desktop_specific/home/advanced_settings/advanced_settings.dart'; +import 'package:stackwallet/pages_desktop_specific/home/settings_menu/advanced_settings/advanced_settings.dart'; import 'package:stackwallet/pages_desktop_specific/home/settings_menu/appearance_settings.dart'; import 'package:stackwallet/pages_desktop_specific/home/settings_menu/backup_and_restore/backup_and_restore_settings.dart'; import 'package:stackwallet/pages_desktop_specific/home/settings_menu/currency_settings.dart'; -import 'package:stackwallet/pages_desktop_specific/home/settings_menu/language_settings.dart'; +import 'package:stackwallet/pages_desktop_specific/home/settings_menu/language_settings/language_settings.dart'; import 'package:stackwallet/pages_desktop_specific/home/settings_menu/nodes_settings.dart'; import 'package:stackwallet/pages_desktop_specific/home/settings_menu/security_settings.dart'; import 'package:stackwallet/pages_desktop_specific/home/settings_menu/settings_menu.dart'; diff --git a/lib/pages_desktop_specific/home/settings_menu/advanced_settings/advanced_settings.dart b/lib/pages_desktop_specific/home/settings_menu/advanced_settings/advanced_settings.dart index 7361d9773..1632576fd 100644 --- a/lib/pages_desktop_specific/home/settings_menu/advanced_settings/advanced_settings.dart +++ b/lib/pages_desktop_specific/home/settings_menu/advanced_settings/advanced_settings.dart @@ -1,7 +1,8 @@ import 'package:flutter/material.dart'; +import 'package:flutter/src/widgets/framework.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:flutter_svg/svg.dart'; -import 'package:stackwallet/pages_desktop_specific/home/advanced_settings/stack_privacy_dialog.dart'; +import 'package:stackwallet/pages_desktop_specific/home/settings_menu/advanced_settings/stack_privacy_dialog.dart'; import 'package:stackwallet/providers/global/prefs_provider.dart'; import 'package:stackwallet/utilities/assets.dart'; import 'package:stackwallet/utilities/text_styles.dart'; @@ -165,7 +166,7 @@ class _AdvancedSettings extends ConsumerState { .textDark), textAlign: TextAlign.left, ), - const ShowLogsButton(), + ShowLogsButton(), ], ), ), @@ -190,7 +191,7 @@ class StackPrivacyButton extends ConsumerWidget { useSafeArea: false, barrierDismissible: true, builder: (context) { - return const StackPrivacyDialog(); + return StackPrivacyDialog(); }, ); } @@ -223,20 +224,19 @@ class ShowLogsButton extends ConsumerWidget { const ShowLogsButton({ Key? key, }) : super(key: key); - - Future viewDebugLogs() async { - // await showDialog( - // context: context, - // useSafeArea: false, - // barrierDismissible: true, - // builder: (context) { - // return const DebugInfoDialog(); - // }, - // ); - } - @override Widget build(BuildContext context, WidgetRef ref) { + // Future viewDebugLogs() async { + // await showDialog( + // context: context, + // useSafeArea: false, + // barrierDismissible: true, + // builder: (context) { + // return const DebugInfoDialog(); + // }, + // ); + // } + return SizedBox( width: 101, height: 37, @@ -246,7 +246,7 @@ class ShowLogsButton extends ConsumerWidget { .getPrimaryEnabledButtonColor(context), onPressed: () { // - viewDebugLogs(); + // viewDebugLogs(); }, child: Text( "Show logs", diff --git a/lib/route_generator.dart b/lib/route_generator.dart index edc677946..c5b764995 100644 --- a/lib/route_generator.dart +++ b/lib/route_generator.dart @@ -91,11 +91,10 @@ import 'package:stackwallet/pages_desktop_specific/home/my_stack_view/my_stack_v import 'package:stackwallet/pages_desktop_specific/home/my_stack_view/wallet_view/desktop_wallet_view.dart'; import 'package:stackwallet/pages_desktop_specific/home/my_stack_view/wallet_view/sub_widgets/qr_code_desktop_popup_content.dart'; import 'package:stackwallet/pages_desktop_specific/home/my_stack_view/wallet_view/sub_widgets/wallet_keys_desktop_popup.dart'; -import 'package:stackwallet/pages_desktop_specific/home/advanced_settings/advanced_settings.dart'; +import 'package:stackwallet/pages_desktop_specific/home/settings_menu/advanced_settings/advanced_settings.dart'; import 'package:stackwallet/pages_desktop_specific/home/settings_menu/appearance_settings.dart'; import 'package:stackwallet/pages_desktop_specific/home/settings_menu/backup_and_restore/backup_and_restore_settings.dart'; import 'package:stackwallet/pages_desktop_specific/home/settings_menu/currency_settings.dart'; -import 'package:stackwallet/pages_desktop_specific/home/settings_menu/language_settings.dart'; import 'package:stackwallet/pages_desktop_specific/home/settings_menu/nodes_settings.dart'; import 'package:stackwallet/pages_desktop_specific/home/settings_menu/security_settings.dart'; import 'package:stackwallet/pages_desktop_specific/home/settings_menu/settings_menu.dart'; @@ -107,6 +106,8 @@ import 'package:stackwallet/utilities/enums/add_wallet_type_enum.dart'; import 'package:stackwallet/utilities/enums/coin_enum.dart'; import 'package:tuple/tuple.dart'; +import 'pages_desktop_specific/home/settings_menu/language_settings/language_settings.dart'; + class RouteGenerator { static const bool useMaterialPageRoute = true;