diff --git a/lib/main.dart b/lib/main.dart index c2352c1..fb41630 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -1,5 +1,5 @@ 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/practice/month/MonthPracticePage.dart'; @@ -19,7 +19,7 @@ class OhThatsA extends StatelessWidget { routes: { '/monthValues': (context) => MonthValuesPage(), '/years': (context) => YearsPage(), - '/practice/month/setup': (context) => MonthPracticeSetupPage(), + '/practice/month/setup': (context) => PracticeSetupPage(), '/practice/month/practice': (context) => MonthPracticePage(), } ); diff --git a/lib/pages/practice/PracticeSetup.dart b/lib/pages/practice/PracticeSetup.dart new file mode 100644 index 0000000..2616c1e --- /dev/null +++ b/lib/pages/practice/PracticeSetup.dart @@ -0,0 +1,6 @@ +class PracticeSetup { + final int count; + final bool showCorrect; + + PracticeSetup(this.count, this.showCorrect); +} \ No newline at end of file diff --git a/lib/pages/practice/month/MonthPracticeSetupPage.dart b/lib/pages/practice/PracticeSetupPage.dart similarity index 83% rename from lib/pages/practice/month/MonthPracticeSetupPage.dart rename to lib/pages/practice/PracticeSetupPage.dart index 795c7f6..b2e46f3 100644 --- a/lib/pages/practice/month/MonthPracticeSetupPage.dart +++ b/lib/pages/practice/PracticeSetupPage.dart @@ -1,14 +1,14 @@ import 'package:flutter/material.dart'; import 'package:numberpicker/numberpicker.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 - _MonthPracticeSetupState createState() => _MonthPracticeSetupState(); + _PracticeSetupState createState() => _PracticeSetupState(); } -class _MonthPracticeSetupState extends State { +class _PracticeSetupState extends State { int _count = 12; bool _showCorrect = true; @override @@ -50,7 +50,7 @@ class _MonthPracticeSetupState extends State { Navigator.pushNamed( context, '/practice/month/practice', - arguments: MonthPracticeSetup(_count, _showCorrect) + arguments: PracticeSetup(_count, _showCorrect) ); }, child: Text("Start!"), diff --git a/lib/pages/practice/month/MonthPracticePage.dart b/lib/pages/practice/month/MonthPracticePage.dart index 414d187..c7392ea 100644 --- a/lib/pages/practice/month/MonthPracticePage.dart +++ b/lib/pages/practice/month/MonthPracticePage.dart @@ -1,5 +1,5 @@ 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/AppDrawer.dart'; import 'package:ohthatsa/util/Months.dart'; @@ -159,7 +159,7 @@ class _MonthPracticeState extends State { @override Widget build(BuildContext context) { - MonthPracticeSetup setup = ModalRoute.of(context).settings.arguments; + PracticeSetup setup = ModalRoute.of(context).settings.arguments; _startCount = setup.count; _showCorrect = setup.showCorrect; return Scaffold( diff --git a/lib/pages/practice/month/MonthPracticeSetup.dart b/lib/pages/practice/month/MonthPracticeSetup.dart deleted file mode 100644 index ad39199..0000000 --- a/lib/pages/practice/month/MonthPracticeSetup.dart +++ /dev/null @@ -1,6 +0,0 @@ -class MonthPracticeSetup { - final int count; - final bool showCorrect; - - MonthPracticeSetup(this.count, this.showCorrect); -} \ No newline at end of file