broodjeaap/ohthatsa_old
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Moved some files around for practice pages

Browse source
This commit is contained in:
BroodjeAap 2020-10-25 16:40:30 +01:00
parent c7dbd1520f
commit 088817ad66
5 changed files with 15 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lib/main.dart
View file

@ -1,5 +1,5 @@
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:ohthatsa/pages/practice/month/MonthPracticeSetupPage.dart'; import 'file:///D:/dev/projects/ohthatsa/lib/pages/practice/PracticeSetupPage.dart';
import 'package:ohthatsa/pages/YearsPage.dart'; import 'package:ohthatsa/pages/YearsPage.dart';
import 'package:ohthatsa/pages/practice/month/MonthPracticePage.dart'; import 'package:ohthatsa/pages/practice/month/MonthPracticePage.dart';
@ -19,7 +19,7 @@ class OhThatsA extends StatelessWidget {
routes: { routes: {
'/monthValues': (context) => MonthValuesPage(), '/monthValues': (context) => MonthValuesPage(),
'/years': (context) => YearsPage(), '/years': (context) => YearsPage(),
'/practice/month/setup': (context) => MonthPracticeSetupPage(), '/practice/month/setup': (context) => PracticeSetupPage(),
'/practice/month/practice': (context) => MonthPracticePage(), '/practice/month/practice': (context) => MonthPracticePage(),
} }
); );

6
lib/pages/practice/PracticeSetup.dart Normal file
View file

@ -0,0 +1,6 @@
class PracticeSetup {
final int count;
final bool showCorrect;
PracticeSetup(this.count, this.showCorrect);
}

10
lib/pages/practice/month/MonthPracticeSetupPage.dart → lib/pages/practice/PracticeSetupPage.dart
View file

@ -1,14 +1,14 @@
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:numberpicker/numberpicker.dart'; import 'package:numberpicker/numberpicker.dart';
import 'package:ohthatsa/AppDrawer.dart'; import 'package:ohthatsa/AppDrawer.dart';
import 'package:ohthatsa/pages/practice/month/MonthPracticeSetup.dart'; import 'file:///D:/dev/projects/ohthatsa/lib/pages/practice/PracticeSetup.dart';
class MonthPracticeSetupPage extends StatefulWidget { class PracticeSetupPage extends StatefulWidget {
@override @override
_MonthPracticeSetupState createState() => _MonthPracticeSetupState(); _PracticeSetupState createState() => _PracticeSetupState();
} }
class _MonthPracticeSetupState extends State<MonthPracticeSetupPage> { class _PracticeSetupState extends State<PracticeSetupPage> {
int _count = 12; int _count = 12;
bool _showCorrect = true; bool _showCorrect = true;
@override @override
@ -50,7 +50,7 @@ class _MonthPracticeSetupState extends State<MonthPracticeSetupPage> {
Navigator.pushNamed( Navigator.pushNamed(
context, context,
'/practice/month/practice', '/practice/month/practice',
arguments: MonthPracticeSetup(_count, _showCorrect) arguments: PracticeSetup(_count, _showCorrect)
); );
}, },
child: Text("Start!"), child: Text("Start!"),

4
lib/pages/practice/month/MonthPracticePage.dart
View file

@ -1,5 +1,5 @@
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:ohthatsa/pages/practice/month/MonthPracticeSetup.dart'; import 'file:///D:/dev/projects/ohthatsa/lib/pages/practice/PracticeSetup.dart';
import 'package:ohthatsa/util/DayCalculator.dart'; import 'package:ohthatsa/util/DayCalculator.dart';
import 'package:ohthatsa/AppDrawer.dart'; import 'package:ohthatsa/AppDrawer.dart';
import 'package:ohthatsa/util/Months.dart'; import 'package:ohthatsa/util/Months.dart';
@ -159,7 +159,7 @@ class _MonthPracticeState extends State<MonthPracticePage> {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
MonthPracticeSetup setup = ModalRoute.of(context).settings.arguments; PracticeSetup setup = ModalRoute.of(context).settings.arguments;
_startCount = setup.count; _startCount = setup.count;
_showCorrect = setup.showCorrect; _showCorrect = setup.showCorrect;
return Scaffold( return Scaffold(

6
lib/pages/practice/month/MonthPracticeSetup.dart
View file

@ -1,6 +0,0 @@
class MonthPracticeSetup {
final int count;
final bool showCorrect;
MonthPracticeSetup(this.count, this.showCorrect);
}