Skip to content
Open
Show file tree
Hide file tree
Changes from 3 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 37 additions & 1 deletion lib/src/app.dart
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@ import 'package:flutter_gen/gen_l10n/app_localizations.dart';
import 'package:flutter_localizations/flutter_localizations.dart';
import 'package:go_router/go_router.dart';
import 'package:t3_memassist/memory_assistant.dart';
import 'package:t3_vault/src/features/greatwall/presentation/pages/dynamic_fractal_derivation_level_page.dart';
import 'package:t3_vault/src/features/greatwall/presentation/pages/dynamic_fractal_tree_inputs_page.dart';
import 'package:t3_vault/src/features/memorization_assistant/presentation/pages/eka_memo_card_practice_page.dart';
import 'package:t3_vault/src/features/memorization_assistant/presentation/pages/memo_card_decks_page.dart';
import 'package:t3_vault/src/features/memorization_assistant/presentation/pages/sa0_memo_card_practice_page.dart';
Expand Down Expand Up @@ -334,6 +336,30 @@ class T3Vault extends StatelessWidget {
),
],
),
GoRoute(
path: DynamicFractalTreeInputsPage.routeName,
pageBuilder:
(BuildContext context, GoRouterState state) {
return MaterialPage(
restorationId:
'router.root.knowledge.dynamic_fractal_inputs',
child: DynamicFractalTreeInputsPage(),
);
},
routes: <RouteBase>[
GoRoute(
path: ConfirmationPage.routeName,
pageBuilder: (BuildContext context,
GoRouterState state) {
return const MaterialPage(
restorationId: 'router.root.knowledge.'
'dynamic_fractal_inputs.confirmation',
child: ConfirmationPage(),
);
},
),
],
),
],
),
GoRoute(
Expand All @@ -356,12 +382,22 @@ class T3Vault extends StatelessWidget {
);
},
),
GoRoute(
path: DynamicFractalDerivationLevelPage.routeName,
pageBuilder:
(BuildContext context, GoRouterState state) {
return const MaterialPage(
restorationId: 'router.root.dynamic_fractal_derivation_level',
child: DynamicFractalDerivationLevelPage(),
);
},
),
GoRoute(
path: DerivationResultPage.routeName,
pageBuilder:
(BuildContext context, GoRouterState state) {
return const MaterialPage(
restorationId: 'router.root.derivation_result',
restorationId: 'router.root.dynamic_fractal_derivation_level_page',
child: DerivationResultPage(),
);
},
Expand Down
4 changes: 4 additions & 0 deletions lib/src/common/localization/app_en.arb
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,10 @@
"@formosaTreeInputsPageTitle": {
"description": "Formosa Tree Inputs Page: Title of the page"
},
"dynamicFractalTreeInputsPageTitle": "Dynamic Fractal Input Parameters",
"@dynamicFractalTreeInputsPageTitle": {
"description": "Dynamic Fractal Tree Inputs Page: Title of the page"
},
"confirmationPageTitle": "Confirmation",
"@confirmationPageTitle": {
"description": "Confirmation Page: Title of the page"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,10 @@ class GreatWallBloc extends Bloc<GreatWallEvent, GreatWallState> {
await Future<void>.delayed(
const Duration(seconds: 1),
() {
_greatWall!.makeTacitDerivation(choice: event.choiceNumber.toString());
_greatWall!.makeTacitDerivation(choice: event.choice);
},
);
if (event.choiceNumber == 0 && _currentLevel > 1) {
if (event.choice == "0" && _currentLevel > 1) {
_currentLevel--;
} else {
_currentLevel++;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -73,12 +73,12 @@ final class GreatWallPasswordVisibilityToggled extends GreatWallEvent {}
final class GreatWallDerivationStarted extends GreatWallEvent {}

final class GreatWallDerivationStepMade extends GreatWallEvent {
final int choiceNumber;
final String choice;

GreatWallDerivationStepMade(this.choiceNumber);
GreatWallDerivationStepMade(this.choice);

@override
List<Object> get props => [choiceNumber];
List<Object> get props => [choice];
}

final class GreatWallDerivationFinished extends GreatWallEvent {}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@ import 'package:flutter/material.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:go_router/go_router.dart';
import 'package:flutter_gen/gen_l10n/app_localizations.dart';
import 'package:great_wall/great_wall.dart';
import 'package:t3_vault/src/features/greatwall/presentation/pages/dynamic_fractal_derivation_level_page.dart';
import 'package:t3_vault/src/features/greatwall/states/derivation_state.dart';

import '../../../../common/settings/presentation/pages/settings_page.dart';
Expand Down Expand Up @@ -87,7 +89,11 @@ class ConfirmationPage extends StatelessWidget {
context
.read<GreatWallBloc>()
.add(GreatWallDerivationStarted());
context.go('/${DerivationLevelPage.routeName}');
if((state.tacitKnowledge) is DynamicFractalTacitKnowledge) {
context.go('/${DynamicFractalDerivationLevelPage.routeName}');
} else {
context.go('/${DerivationLevelPage.routeName}');
}
},
);
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ class DerivationLevelPage extends StatelessWidget {
if (state.currentLevel > 1) {
context
.read<GreatWallBloc>()
.add(GreatWallDerivationStepMade(0));
.add(GreatWallDerivationStepMade("0"));
context.go('/${DerivationLevelPage.routeName}');
}
},
Expand All @@ -80,7 +80,7 @@ class DerivationLevelPage extends StatelessWidget {
() {
if (!context.mounted) return;
context.read<GreatWallBloc>().add(
GreatWallDerivationStepMade(index + 1));
GreatWallDerivationStepMade((index + 1).toString()));
if (state.currentLevel < state.treeDepth) {
context.go(
'/${DerivationLevelPage.routeName}',
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,67 @@
import 'package:flutter/material.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:flutter_gen/gen_l10n/app_localizations.dart';
import 'package:go_router/go_router.dart';

import '../../../../common/settings/presentation/pages/settings_page.dart';
import '../blocs/blocs.dart';
import 'dynamic_fractal_renderer_page.dart';

class DynamicFractalDerivationLevelPage extends StatefulWidget {
static const routeName = 'dynamic_fractal_derivation_level';

const DynamicFractalDerivationLevelPage({super.key});

@override
State<DynamicFractalDerivationLevelPage> createState() {
return _DynamicFractalDerivationLevelPageState();
}
}

class _DynamicFractalDerivationLevelPageState
extends State<DynamicFractalDerivationLevelPage> {
@override
Widget build(BuildContext context) {
return Scaffold(
appBar: AppBar(
title: Text(AppLocalizations.of(context)!.derivationLevelPageTitle),
leading: IconButton(
icon: const Icon(Icons.arrow_back),
onPressed: () {
context.read<GreatWallBloc>().add(GreatWallReset());
Navigator.of(context).pop();
},
),
actions: [
IconButton(
icon: const Icon(Icons.settings),
onPressed: () {
context.go('/${SettingsPage.routeName}');
},
),
],
),
body: Center(
child: BlocBuilder<GreatWallBloc, GreatWallState>(
builder: (context, state) {
if (state is GreatWallDeriveInProgress) {
return const Center(
child: CircularProgressIndicator(),
);
} else if (state is GreatWallDeriveStepSuccess) {
Offset exponent = Offset(
(state.knowledgePalettes[0].knowledge).x,
(state.knowledgePalettes[0].knowledge).y);
return DynamicFractalRenderer(
exponent
);
} else {
return Center(
child: Text(AppLocalizations.of(context)!.noLevel),
);
}
}),
),
);
}
}
Loading