Skip to content

Commit

Permalink
fix: fixing deamon config method about initializing on next button in…
Browse files Browse the repository at this point in the history 
… each screen

- update `FinishPage`
- update `InitializeModeScreen`
- update `MasterPasswordPage`
- update `RestorationSeedPage`
- update `ValidatorConfigPage`
  • Loading branch information
@PouriaMoradi021
PouriaMoradi021 committed Jan 31, 2025
1 parent 822f4da commit 56a8ebe
Show file tree
Hide file tree
Showing 6 changed files with 44 additions and 106 deletions.
9 changes: 6 additions & 3 deletions lib/src/core/utils/gen/localization/locale_keys.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,12 @@ abstract class LocaleKeys {
static const String initializing = 'initializing';
static const String finish = 'finish';
static const String initiate_your_node = 'initiate_your_node';
static const String initiate_your_node_for_first_time = 'initiate_your_node_for_first_time';
static const String create_local_node_from_scrache = 'create_local_node_from_scrache';
static const String restore_local_node_from_seed_pharse = 'restore_local_node_from_seed_pharse';
static const String initiate_your_node_for_first_time =
'initiate_your_node_for_first_time';
static const String create_local_node_from_scrache =
'create_local_node_from_scrache';
static const String restore_local_node_from_seed_pharse =
'restore_local_node_from_seed_pharse';
static const String connect_to_remote_node = 'connect_to_remote_node';
static const String remote_address = 'remote_address';
static const String auth_method = 'auth_method';
Expand Down
26 changes: 3 additions & 23 deletions lib/src/features/finish/presentation/screen/finish_page.dart
View file
Original file line number Diff line number Diff line change
@@ -1,13 +1,10 @@
import 'package:fluent_ui/fluent_ui.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:go_router/go_router.dart';
import 'package:gui/src/core/common/colors/app_colors.dart';
import 'package:gui/src/core/router/route_name.dart';
import 'package:gui/src/core/utils/daemon_manager/bloc/daemon_cubit.dart';
import 'package:gui/src/core/utils/daemon_manager/bloc/daemon_state.dart';
import 'package:gui/src/core/utils/daemon_manager/node_config_data.dart';
import 'package:gui/src/features/main/navigation_pan_cubit/presentation/cubits/navigation_pan_cubit.dart';
import 'package:pactus_gui_widgetbook/app_styles.dart';

class FinishPage extends StatelessWidget {
const FinishPage({super.key});
Expand All @@ -17,16 +14,6 @@ class FinishPage extends StatelessWidget {
return BlocBuilder<NavigationPaneCubit, int>(
builder: (context, selectedIndex) {
return NavigationView(
appBar: NavigationAppBar(
title: Text(
'InitializingPage',
style: FluentTheme.of(context).typography.body!.copyWith(
color: AppTheme.of(context)
.extension<OnSurfacePallet>()!
.onSurface4,
),
),
),
content: Center(
child: Column(
children: [
Expand Down Expand Up @@ -95,12 +82,6 @@ class FinishPage extends StatelessWidget {
},
),
),
Button(
onPressed: () {
context.goNamed(AppRoute.password.name);
},
child: Text('Navigate to ${AppRoute.password.name}'),
),
Row(
mainAxisAlignment: MainAxisAlignment.center,
children: [
Expand All @@ -113,12 +94,11 @@ class FinishPage extends StatelessWidget {
},
),
const SizedBox(width: 20),
if (selectedIndex < 6)

Button(
child: const Text('Next'),
child: const Text('Finish'),
onPressed: () {
context.read<NavigationPaneCubit>()
.setSelectedIndex(selectedIndex + 1);
///to-do : navigate to dashboard navigation pane here
},
),
],
Expand Down
38 changes: 14 additions & 24 deletions lib/src/features/initialize_mode/presentation/screen/initialize_mode_screen.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import 'package:fluent_ui/fluent_ui.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:gap/gap.dart';
import 'package:gui/src/core/common/colors/app_colors.dart';
import 'package:gui/src/core/common/widgets/custom_filled_button.dart';
import 'package:gui/src/core/utils/gen/localization/locale_keys.dart';
import 'package:gui/src/features/initialize_mode/presentation/sections/remote_node_section.dart';
import 'package:gui/src/features/initialize_mode/presentation/widgets/radio_button_group_widget.dart';
Expand Down Expand Up @@ -38,8 +39,8 @@ class InitializeModeScreen extends StatelessWidget {
),
const Gap(8),
Text(
context.tr
(LocaleKeys.initiate_your_node_for_first_time),
context.
tr(LocaleKeys.initiate_your_node_for_first_time),
style: InterTextStyles.smallRegular.copyWith(
color: AppColors.primaryGray,
),
Expand Down Expand Up @@ -80,28 +81,18 @@ class InitializeModeScreen extends StatelessWidget {
padding: const EdgeInsets.only(right: 46),
child: Align(
alignment: Alignment.centerRight,
child: SizedBox(
height: 32,
child: Button(
style: ButtonStyle(
backgroundColor: WidgetStatePropertyAll(
AppColors.radioButtonActiveColor,
),
padding: WidgetStatePropertyAll(
const EdgeInsets.symmetric(horizontal: 16),
),
child: CustomFilledButton(
text: 'Next',
onPressed: () {
context.read<NavigationPaneCubit>().
setSelectedIndex(selectedIndex + 1);
},
style: ButtonStyle(
backgroundColor: WidgetStatePropertyAll(
AppColors.radioButtonActiveColor,
),
onPressed: () {
context.read<NavigationPaneCubit>()
.setSelectedIndex(selectedIndex + 1);
},
child: Text(
'Next',
style: InterTextStyles.bodyBold.copyWith(
color: AppTheme.of(context)
.extension<SurfacePallet>()!
.surface3,
),
padding: WidgetStatePropertyAll(
const EdgeInsets.symmetric(horizontal: 16),
),
),
),
Expand All @@ -116,4 +107,3 @@ class InitializeModeScreen extends StatelessWidget {
);
}
}

11 changes: 2 additions & 9 deletions lib/src/features/master_password/presentation/screen/master_password_page.dart
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
import 'package:fluent_ui/fluent_ui.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:go_router/go_router.dart';
import 'package:gui/src/core/router/route_name.dart';
import 'package:gui/src/core/utils/daemon_manager/node_config_data.dart';
import 'package:gui/src/features/main/navigation_pan_cubit/presentation/cubits/navigation_pan_cubit.dart';
import 'package:pactus_gui_widgetbook/app_styles.dart';
Expand Down Expand Up @@ -52,13 +50,6 @@ class _MasterPasswordPageState extends State<MasterPasswordPage> {
),
),
),
Button(
onPressed: () {
NodeConfigData.instance.password = directoryController.text;
context.goNamed(AppRoute.validatorConfig.name);
},
child: Text('Navigate to ${AppRoute.validatorConfig.name}'),
),
Row(
mainAxisAlignment: MainAxisAlignment.center,
children: [
Expand All @@ -75,6 +66,8 @@ class _MasterPasswordPageState extends State<MasterPasswordPage> {
Button(
child: const Text('Next'),
onPressed: () {
NodeConfigData.instance.password =
directoryController.text;
context.read<NavigationPaneCubit>()
.setSelectedIndex(selectedIndex + 1);
},
Expand Down
12 changes: 2 additions & 10 deletions lib/src/features/restoration_seed/presentation/screen/restoration_seed_page.dart
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
import 'package:fluent_ui/fluent_ui.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:go_router/go_router.dart';
import 'package:gui/src/core/router/route_name.dart';
import 'package:gui/src/core/utils/daemon_manager/node_config_data.dart';
import 'package:gui/src/core/utils/daemon_manager/seed_generator.dart';
import 'package:gui/src/features/main/navigation_pan_cubit/presentation/cubits/navigation_pan_cubit.dart';
Expand Down Expand Up @@ -63,14 +61,6 @@ class RestorationSeedPage extends StatelessWidget {
.onSurface4,
),
),
Button(
onPressed: () {
NodeConfigData.instance.restorationSeed =
'${SeedGenerator().generateSeed(12)?.sentence}';
context.goNamed(AppRoute.confirmationSeed.name);
},
child: Text('Navigate to ${AppRoute.confirmationSeed.name}'),
),
Row(
mainAxisAlignment: MainAxisAlignment.center,
children: [
Expand All @@ -87,6 +77,8 @@ class RestorationSeedPage extends StatelessWidget {
Button(
child: const Text('Next'),
onPressed: () {
NodeConfigData.instance.restorationSeed =
'${SeedGenerator().generateSeed(12)?.sentence}';
context.read<NavigationPaneCubit>()
.setSelectedIndex(selectedIndex + 1);
},
Expand Down
54 changes: 17 additions & 37 deletions lib/src/features/validator_config/presentation/screen/validator_config_page.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,9 @@ import 'package:file_selector/file_selector.dart';
import 'package:fluent_ui/fluent_ui.dart';
import 'package:flutter/services.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:go_router/go_router.dart';
import 'package:gui/src/core/common/colors/app_colors.dart';
import 'package:gui/src/core/router/route_name.dart';
import 'package:gui/src/core/utils/daemon_manager/node_config_data.dart';
import 'package:gui/src/features/main/navigation_pan_cubit/presentation/cubits/navigation_pan_cubit.dart';
import 'package:pactus_gui_widgetbook/app_styles.dart';

class ValidatorConfigPage extends StatefulWidget {
const ValidatorConfigPage({super.key});
Expand Down Expand Up @@ -57,16 +54,6 @@ class _ValidatorConfigPageState extends State<ValidatorConfigPage> {
return BlocBuilder<NavigationPaneCubit, int>(
builder: (context, selectedIndex) {
return NavigationView(
appBar: NavigationAppBar(
title: Text(
'Validator Config Page',
style: FluentTheme.of(context).typography.body!.copyWith(
color: AppTheme.of(context)
.extension<OnSurfacePallet>()!
.onSurface4,
),
),
),
content: Center(
child: Padding(
padding: const EdgeInsets.all(16),
Expand Down Expand Up @@ -105,27 +92,6 @@ class _ValidatorConfigPageState extends State<ValidatorConfigPage> {
),
),
),
Center(
child: Button(
onPressed: () async {
final isNotEmptyDirectory = await _isNotEmptyDirectory();
if (isNotEmptyDirectory) {
if (context.mounted) {
showFluentAlert(context);
}
} else {
NodeConfigData.instance.validatorQty =
validatorQtyController.text;
NodeConfigData.instance.workingDirectory =
directoryController.text;
if (context.mounted) {
context.goNamed(AppRoute.initializing.name);
}
}
},
child: Text('Navigate to ${AppRoute.initializing.name}'),
),
),
Row(
mainAxisAlignment: MainAxisAlignment.center,
children: [
Expand All @@ -141,9 +107,23 @@ class _ValidatorConfigPageState extends State<ValidatorConfigPage> {
if (selectedIndex < 6)
Button(
child: const Text('Next'),
onPressed: () {
context.read<NavigationPaneCubit>()
.setSelectedIndex(selectedIndex + 1);
onPressed: () async {
final isNotEmptyDirectory =
await _isNotEmptyDirectory();
if (isNotEmptyDirectory) {
if (context.mounted) {
showFluentAlert(context);
}
} else {
NodeConfigData.instance.validatorQty =
validatorQtyController.text;
NodeConfigData.instance.workingDirectory =
directoryController.text;
if (context.mounted) {
context.read<NavigationPaneCubit>()
.setSelectedIndex(selectedIndex + 1);
}
}
},
),
],
Expand Down

0 comments on commit 56a8ebe

Please sign in to comment.